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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-14 13:48:35 +0300 (Tue, 14 Apr 2009)
New Revision: 18056

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
Log:
move XFLush calls, trap X errors


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-14 10:27:45 UTC (rev 18055)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-14 10:48:35 UTC (rev 18056)
@@ -1,3 +1,11 @@
+2009-04-14  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Release 0.2.32
+
+	* matchbox/core/mb-window-manager.c (mb_wm_sync, mb_wm_set_theme):
+	Move XFlushes after XUngrabServer calls. Also, trap X errors for them
+	to fix a crash Bhabani saw.
+
 2009-04-09  Adam Endrodi  <adam.endrodi at blumsoft.eu>
 
 	Reliability improvements.
@@ -2,3 +10,4 @@
 
-	* comp-mgr/mb-wm-comp-mgr-clutter.c (mb_wm_comp_mgr_clutter_client_destroy):
+	* comp-mgr/mb-wm-comp-mgr-clutter.c
+	(mb_wm_comp_mgr_clutter_client_destroy):
 	  Sync before untrapping the error; if not gdk will get it and it

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-14 10:27:45 UTC (rev 18055)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-14 10:48:35 UTC (rev 18056)
@@ -1,3 +1,10 @@
+matchbox-window-manager-2 (0.2.32-1) unstable; urgency=low
+
+  * Move XFlush after the corresponding XUngrabServer call.
+  * Trap more X errors.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 14 Apr 2009 13:43:32 +0300
+
 matchbox-window-manager-2 (0.2.31-1) unstable; urgency=low
 
   * Fixes: NB#104842 - Ocassional White Screen of Death locks

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-04-14 10:27:45 UTC (rev 18055)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-04-14 10:48:35 UTC (rev 18056)
@@ -1025,8 +1025,10 @@
    *        synced up here.
   */
 
+  XUngrabServer(wm->xdpy);
+  mb_wm_util_trap_x_errors();
   XFlush(wm->xdpy);
-  XUngrabServer(wm->xdpy);
+  mb_wm_util_untrap_x_errors();
 
   wm->sync_type = 0;
 }
@@ -2143,8 +2145,10 @@
   mb_wm_object_signal_emit (MB_WM_OBJECT (wm),
 			    MBWindowManagerSignalThemeChange);
 
+  XUngrabServer(wm->xdpy);
+  mb_wm_util_trap_x_errors();
   XFlush(wm->xdpy);
-  XUngrabServer(wm->xdpy);
+  mb_wm_util_untrap_x_errors();
 }
 
 void