--- gnome-settings-daemon-2.22.1/plugins/mouse/gsd-mouse-manager.c.bad	2008-08-24 03:35:14.000000000 +0200
+++ gnome-settings-daemon-2.22.1/plugins/mouse/gsd-mouse-manager.c	2008-08-24 04:20:47.000000000 +0200
@@ -267,6 +267,8 @@
         gint i;
 
         device_info = XListInputDevices (GDK_DISPLAY (), &n_devices);
+        if (device_info == NULL)
+                return;
 
         if (n_devices > 0)
                 buttons = g_new (guchar, buttons_capacity);
@@ -407,6 +409,9 @@
 	int values[2];
         XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
 	XDeviceResolutionControl c;
+
+	if (deviceList == NULL)
+		return 0;
 	
 	values[0] = 0;
 	values[1] = state ? 0 : 1; /* setting is touchpad off */
@@ -446,6 +451,9 @@
 	int values[2];
         XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
 	XDeviceResolutionControl c;
+
+	if (deviceList == NULL)
+		return 0;
 	
 	values[0] = 1;
 	values[1] = state;
@@ -485,6 +493,9 @@
 	int values[2];
         XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
 	XDeviceResolutionControl c;
+
+	if (deviceList == NULL)
+		return 0;
 	
 	values[0] = 2;
 	values[1] = state;
@@ -524,6 +535,9 @@
 	int values[2];
         XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
 	XDeviceResolutionControl c;
+
+	if (deviceList == NULL)
+		return 0;
 	
 	values[0] = 3;
 	values[1] = state;