[maemo-commits] [maemo-commits] r19045 - in projects/haf/trunk/libmatchbox2: . debian matchbox/core

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-05 10:36:58 +0300 (Wed, 05 Aug 2009)
New Revision: 19045

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c
Log:
Avoid crash if decor or its parent has passed away...



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-05 06:37:25 UTC (rev 19044)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-08-05 07:36:58 UTC (rev 19045)
@@ -1,3 +1,10 @@
+2009-08-05  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-wm-decor.c (mb_wm_decor_button_press_handler):
+	Don't crash if the decor or its parent has been destroyed.
+	Fixes: NB#131123 - Desktop crashes observed when tapping on 'back'
+	button quickly on various applications
+
 2009-07-29  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	* matchbox/core/mb-wm-util.c (error_handler):

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-08-05 06:37:25 UTC (rev 19044)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-08-05 07:36:58 UTC (rev 19045)
@@ -1,6 +1,8 @@
 matchbox-window-manager-2 (0.2.53-1~unreleased) unstable; urgency=low
 
-  * foo
+  Kimmo:
+  * Fixes: NB#131123 - Desktop crashes observed when tapping on 'back' button
+    quickly on various applications
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 28 Jul 2009 15:55:57 +0300
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c	2009-08-05 06:37:25 UTC (rev 19044)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c	2009-08-05 07:36:58 UTC (rev 19045)
@@ -787,12 +787,14 @@
 {
   MBWMDecorButton *button = (MBWMDecorButton *)userdata;
   MBWMDecor       *decor  = button->decor;
-  MBWindowManager *wm = decor->parent_client->wmref;
+  MBWindowManager *wm;
   MBWMList        *transients = NULL;
   Bool             retval = True;
 
-  if (!button->realized)
+  if (!button->realized || !decor || !decor->parent_client)
     return False;
+
+  wm = decor->parent_client->wmref;
   
   mb_wm_object_ref (MB_WM_OBJECT(button));