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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-08 14:06:18 +0300 (Wed, 08 Apr 2009)
New Revision: 18033

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
Log:
add some XFLushes


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-08 07:49:49 UTC (rev 18032)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-04-08 11:06:18 UTC (rev 18033)
@@ -1,3 +1,8 @@
+2009-04-08  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/core/mb-window-manager.c (mb_wm_sync, mb_wm_set_theme):
+	Call XFlush before each XUngrabServer to fix a lock-up. NB#104842
+
 2009-04-07  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.30

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-08 07:49:49 UTC (rev 18032)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-04-08 11:06:18 UTC (rev 18033)
@@ -1,3 +1,9 @@
+matchbox-window-manager-2 (0.2.31-1~unreleased) unstable; urgency=low
+
+  * Fixes: NB#104842 - Ocassional White Screen of Death locks
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed,  8 Apr 2009 12:32:59 +0300
+
 matchbox-window-manager-2 (0.2.30-1) unstable; urgency=low
 
   * Fixes: NB#109073 - Unable to show mouse pointer.

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-04-08 07:49:49 UTC (rev 18032)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-04-08 11:06:18 UTC (rev 18033)
@@ -1025,6 +1025,7 @@
    *        synced up here.
   */
 
+  XFlush(wm->xdpy);
   XUngrabServer(wm->xdpy);
 
   wm->sync_type = 0;
@@ -2142,7 +2143,7 @@
   mb_wm_object_signal_emit (MB_WM_OBJECT (wm),
 			    MBWindowManagerSignalThemeChange);
 
-
+  XFlush(wm->xdpy);
   XUngrabServer(wm->xdpy);
 }