Merge lp:~3v1n0/bamf/trap-x-errors into lp:~unity-team/bamf/0.5

[Marco Trevisan (Treviño)]

BamfXutils: trap the X errors when doing async X calls

Backport of lp:~3v1n0/bamf/trap-x-errors/+merge/192980

[Christopher Townsend (townsend)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/bamf-0.5-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-0.5-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-0.5-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/bamf-0.5-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/bamf-0.5-ci/1/rebuild

review: Approve (continuous-integration)

=== modified file 'src/bamf-xutils.c'
--- src/bamf-xutils.c	2012-11-15 17:45:29 +0000
+++ src/bamf-xutils.c	2013-10-29 00:40:18 +0000
@@ -44,6 +44,26 @@
   return xdisplay;
 }
 
+static gboolean
+gdk_error_trap_pop_and_print (Display *dpy)
+{
+  gdk_flush ();
+  gint error_code = gdk_error_trap_pop ();
+
+  if (error_code)
+    {
+      gchar tmp[1024];
+      XGetErrorText (dpy, error_code, tmp, sizeof (tmp) - 1);
+      tmp[sizeof (tmp) - 1] = '\0';
+
+      g_warning("Got an X error: %s\n", tmp);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 static void
 bamf_xutils_get_string_window_hint_and_type (Window xid, const char *atom_name,
                                              gchar** return_hint, Atom* return_type)
@@ -74,6 +94,8 @@
     return;
   }
 
+  gdk_error_trap_push ();
+
   int result = XGetWindowProperty (XDisplay,  xid,
                                    gdk_x11_get_xatom_by_name (atom_name),
                                    0,  G_MAXINT, False, AnyPropertyType,
@@ -83,7 +105,7 @@
   if (close_display)
     XCloseDisplay (XDisplay);
 
-  if (result == Success && numItems > 0)
+  if (result == Success && numItems > 0 && !gdk_error_trap_pop_and_print (XDisplay))
     {
       if (return_type)
         *return_type = type;
@@ -135,12 +157,20 @@
   else if (type != XA_STRING && type != gdk_x11_get_xatom_by_name("UTF8_STRING"))
     {
       g_error ("Impossible to set the atom %s on Window %lu", atom_name, xid);
+
+      if (close_display)
+        XCloseDisplay (XDisplay);
+
       return;
     }
 
+  gdk_error_trap_push ();
+
   XChangeProperty (XDisplay, xid, gdk_x11_get_xatom_by_name (atom_name),
                    type, 8, PropModeReplace, (unsigned char *) value, strlen (value));
 
+  gdk_error_trap_pop_and_print (XDisplay);
+
   if (close_display)
     XCloseDisplay (XDisplay);
 }
@@ -163,15 +193,20 @@
   class_hint.res_name = NULL;
   class_hint.res_class = NULL;
 
+  gdk_error_trap_push ();
+
   XGetClassHint(xdisplay, xid, &class_hint);
 
-  if (class_name && class_hint.res_class && class_hint.res_class[0] != 0)
-    *class_name = g_convert (class_hint.res_class, -1, "utf-8", "iso-8859-1",
-                             NULL, NULL, NULL);
+  if (!gdk_error_trap_pop_and_print (xdisplay))
+    {
+      if (class_name && class_hint.res_class && class_hint.res_class[0] != 0)
+        *class_name = g_convert (class_hint.res_class, -1, "utf-8", "iso-8859-1",
+                                 NULL, NULL, NULL);
 
-  if (class_instance_name && class_hint.res_name && class_hint.res_name[0] != 0)
-    *class_instance_name = g_convert (class_hint.res_name, -1, "utf-8", "iso-8859-1",
-                                      NULL, NULL, NULL);
+      if (class_instance_name && class_hint.res_name && class_hint.res_name[0] != 0)
+        *class_instance_name = g_convert (class_hint.res_name, -1, "utf-8", "iso-8859-1",
+                                          NULL, NULL, NULL);
+    }
 
   XFree (class_hint.res_class);
   XFree (class_hint.res_name);