gnome-settings-daemon r627 - in branches/gnome-2-24: . plugins/mouse

[jensg svn gnome org]

Author: jensg
Date: Thu Dec  4 17:36:00 2008
New Revision: 627
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=627&view=rev

Log:
2008-12-04  Jens Granseuer  <jensgr gmx net>

	Merged from trunk.

	* plugins/mouse/gsd-mouse-manager.c: (set_devicepresence_handler):
	fix crash with X servers that don't provide XInput (bug #562977)


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/plugins/mouse/gsd-mouse-manager.c

Modified: branches/gnome-2-24/plugins/mouse/gsd-mouse-manager.c
==============================================================================
--- branches/gnome-2-24/plugins/mouse/gsd-mouse-manager.c	(original)
+++ branches/gnome-2-24/plugins/mouse/gsd-mouse-manager.c	Thu Dec  4 17:36:00 2008
@@ -327,10 +327,15 @@
 static void
 set_devicepresence_handler (GsdMouseManager *manager)
 {
-        Display *display = gdk_x11_get_default_xdisplay ();
+        Display *display;
         XEventClass class_presence;
         int xi_presence;
 
+        if (!supports_xinput_devices ())
+                return;
+
+        display = gdk_x11_get_default_xdisplay ();
+
         gdk_error_trap_push ();
         DevicePresence (display, xi_presence, class_presence);
         XSelectExtensionEvent (display,