[maemo-commits] [maemo-commits] r17811 - in projects/haf/trunk/clutter0.8: clutter/x11 debian

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-03-26 16:59:10 +0200 (Thu, 26 Mar 2009)
New Revision: 17811

Modified:
   projects/haf/trunk/clutter0.8/clutter/x11/clutter-event-x11.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
fix HD crash by trapping some X errors


Modified: projects/haf/trunk/clutter0.8/clutter/x11/clutter-event-x11.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/x11/clutter-event-x11.c	2009-03-26 13:51:39 UTC (rev 17810)
+++ projects/haf/trunk/clutter0.8/clutter/x11/clutter-event-x11.c	2009-03-26 14:59:10 UTC (rev 17811)
@@ -108,7 +108,12 @@
 static gboolean
 check_xpending (ClutterBackend *backend)
 {
-  return XPending (CLUTTER_BACKEND_X11 (backend)->xdpy);
+  int events;
+  clutter_x11_trap_x_errors ();
+  events = XPending (CLUTTER_BACKEND_X11 (backend)->xdpy);
+  if (clutter_x11_untrap_x_errors ())
+    /* g_warning ("%s: X errors received during XPending call", __func__) */ ;
+  return events;
 }
 
 static gboolean

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-03-26 13:51:39 UTC (rev 17810)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-03-26 14:59:10 UTC (rev 17811)
@@ -1,6 +1,9 @@
 clutter (0.8.2-0maemo24~unreleased) unstable; urgency=low
 
-  * writeme
+  Kimmo:
+  * x11/clutter-event-x11.c (check_xpending): Trap X errors during XPending
+    call. This
+  * Fixes: NB#108179 - Desktop crashes when device rebooted.
 
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 23 Mar 2009 14:33:10 +0200