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

[From: subversion at stage.maemo.org]

Author: aendrodi
Date: 2009-04-03 12:37:39 +0300 (Fri, 03 Apr 2009)
New Revision: 18002

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c
Log:
	* matchbox/core/mb-wm-decor.c (mb_wm_decor_button_destroy):
	  Reverted the latest workaround for NB#109094.
	  The problem is supposed to be fixed in hildon-desktop
	  and it broke long-press-back-button.


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-03 08:29:29 UTC (rev 18001)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-03 09:37:39 UTC (rev 18002)
@@ -1,3 +1,10 @@
+2009-04-03  Adam Endrodi  <adam.endrodi at blumsoft.eu>
+
+	* matchbox/core/mb-wm-decor.c (mb_wm_decor_button_destroy):
+	  Reverted the latest workaround for NB#109094.
+	  The problem is supposed to be fixed in hildon-desktop
+	  and it broke long-press-back-button.
+
 2009-04-03  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.29

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c	2009-04-03 08:29:29 UTC (rev 18001)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-decor.c	2009-04-03 09:37:39 UTC (rev 18002)
@@ -1104,16 +1104,12 @@
 static void
 mb_wm_decor_button_destroy (MBWMObject* obj)
 {
-  MBWMDecorButton * button = MB_WM_DECOR_BUTTON (obj);
+  //MBWMDecorButton * button = MB_WM_DECOR_BUTTON (obj);
+  /*
+   * We are doing the job in the mb_wm_decor_button_unrealize() while the
+   * decoration still exists.
+   */
 
-  /* unrealise ourselves */
-  if (button->realized)
-    mb_wm_decor_button_unrealize(button);
-
-  /* remove ourselves from the list of buttons in decor */
-  if (button->decor)
-    button->decor->buttons = mb_wm_util_list_remove(button->decor->buttons,
-                                                    button);
 }
 
 static void