[maemo-commits] [maemo-commits] r18301 - in projects/haf/trunk/libmatchbox2: . debian matchbox/comp-mgr

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-11 13:55:45 +0300 (Mon, 11 May 2009)
New Revision: 18301

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
Log:
trap X errors when compositor starts


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-11 07:50:12 UTC (rev 18300)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-05-11 10:55:45 UTC (rev 18301)
@@ -1,3 +1,9 @@
+2009-05-11  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	* matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
+	(mb_wm_comp_mgr_clutter_turn_on_real): Trap X errors and check that
+	clutter_x11_get_stage_window succeeds. Fixes: NB#115724
+
 2009-05-08  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 	
 	NB#106650: ROTATION: HildonAppMenu is too narrow in portrait

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-05-11 07:50:12 UTC (rev 18300)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-05-11 10:55:45 UTC (rev 18301)
@@ -8,6 +8,10 @@
   * Fixes: NB#111652 - legacy widget : application menu is not horizontally
     aligned application title text
 
+  Kimmo:
+  * Fixes: NB#115724 - hildon-desktop received an X Window System error:
+    BadWindow (invalid Window parameter)
+
   Adam:
   * Now try to deal with preexisting fullscreen clients correctly, for real.
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-05-11 07:50:12 UTC (rev 18300)
+++ projects/haf/trunk/libmatchbox2/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c	2009-05-11 10:55:45 UTC (rev 18301)
@@ -661,7 +661,14 @@
        * Fetch the overlay window
        */
       xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
+      if (!xwin)
+      {
+        g_critical ("%s: clutter_x11_get_stage_window failed", __func__);
+        return;
+      }
 
+      mb_wm_util_trap_x_errors();
+
       /* Make sure the overlay window's size is the same as the screen's
        * actual size.  Necessary if the screen is rotated. */
       priv->overlay_window =
@@ -692,6 +699,10 @@
 
       XFixesDestroyRegion (wm->xdpy, region);
 
+      XSync (wm->xdpy, False);
+      if (mb_wm_util_untrap_x_errors())
+        g_warning ("%s: X errors", __func__);
+
       clutter_actor_set_size (stage, wm->xdpy_width, wm->xdpy_height);
       clutter_stage_set_color (CLUTTER_STAGE (stage), &clr);