From kde-core-devel  Tue Mar 29 16:11:17 2005
From: Albert Astals Cid <astals11 () terra ! es>
Date: Tue, 29 Mar 2005 16:11:17 +0000
To: kde-core-devel
Subject: KToolBarButton patch
Message-Id: <200503291811.18203.astals11 () terra ! es>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=111211271910336
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary-00=_m4XSCF4In9aH0ag"

--Boundary-00=_m4XSCF4In9aH0ag
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi, this patch fixes a crash in Umbrello (clicking on the button with the [x] 
on the tabwidget) because they are using a KToolBarButton inside a KTabWidget 
so d->m_parent is null

Is this patch ok to commit or should Umbrello guys fix their code?

Albert

--Boundary-00=_m4XSCF4In9aH0ag
Content-Type: text/x-diff;
  charset="us-ascii";
  name="ktoolbarbutton.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="ktoolbarbutton.patch"

? ktoolbarbutton.patch
Index: ktoolbarbutton.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdeui/ktoolbarbutton.cpp,v
retrieving revision 1.88
diff -u -r1.88 ktoolbarbutton.cpp
--- ktoolbarbutton.cpp	17 Feb 2005 18:32:37 -0000	1.88
+++ ktoolbarbutton.cpp	29 Mar 2005 16:07:15 -0000
@@ -655,7 +655,7 @@
   emit clicked( d->m_id );
 
   // emit buttonClicked when the button was clicked while being in an extension popupmenu
-  if ( !d->m_parent->rect().contains( geometry() ) ) {
+  if ( d->m_parent && !d->m_parent->rect().contains( geometry() ) ) {
     ButtonState state = KApplication::keyboardMouseState();
     if ( ( state & MouseButtonMask ) == NoButton )
       state = ButtonState( LeftButton | state );

--Boundary-00=_m4XSCF4In9aH0ag--