gnome-settings-daemon r606 - in trunk: . plugins/mouse

[jensg svn gnome org]

Author: jensg
Date: Thu Nov 20 17:58:50 2008
New Revision: 606
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=606&view=rev

Log:
2008-11-20  Jens Granseuer  <jensgr gmx net>

	* plugins/mouse/gsd-mouse-manager.c: (set_devicepresence_handler):
	trap X errors so we don't crash on X servers that don't support
	DevicePresence (bug #560618)


Modified:
   trunk/ChangeLog
   trunk/plugins/mouse/gsd-mouse-manager.c

Modified: trunk/plugins/mouse/gsd-mouse-manager.c
==============================================================================
--- trunk/plugins/mouse/gsd-mouse-manager.c	(original)
+++ trunk/plugins/mouse/gsd-mouse-manager.c	Thu Nov 20 17:58:50 2008
@@ -333,11 +333,15 @@
         XEventClass class_presence;
         int xi_presence;
 
+        gdk_error_trap_push ();
         DevicePresence (display, xi_presence, class_presence);
         XSelectExtensionEvent (display,
                                RootWindow (display, DefaultScreen (display)),
                                &class_presence, 1);
-        gdk_window_add_filter (NULL, devicepresence_filter, manager);
+
+        gdk_flush ();
+        if (!gdk_error_trap_pop ())
+                gdk_window_add_filter (NULL, devicepresence_filter, manager);
 }
 #endif