diff -ru gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c --- gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c 2010-02-04 18:15:56.000000000 -0500 +++ gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c 2010-11-01 03:27:22.154114394 -0400 @@ -348,7 +348,9 @@ gint op_code, event, error; - if (!XQueryExtension(GDK_DISPLAY(), + display = gdk_x11_get_default_xdisplay(); + + if (!XQueryExtension(display, "XInputExtension", &op_code, &event, @@ -356,8 +358,6 @@ return; } - display = gdk_x11_get_default_xdisplay(); - gdk_error_trap_push(); DevicePresence(display, xi_presence, class_presence); XSelectExtensionEvent(display, diff -ru gpointing-device-settings-1.5.1-orig/src/gpds-xinput.c gpointing-device-settings-1.5.1/src/gpds-xinput.c --- gpointing-device-settings-1.5.1-orig/src/gpds-xinput.c 2010-01-19 05:01:30.000000000 -0500 +++ gpointing-device-settings-1.5.1/src/gpds-xinput.c 2010-11-01 03:37:58.756114397 -0400 @@ -99,7 +99,7 @@ g_free(priv->device_name); if (priv->device) { - XCloseDevice(GDK_DISPLAY(), priv->device); + XCloseDevice(gdk_x11_get_default_xdisplay(), priv->device); priv->device = NULL; } @@ -193,7 +193,8 @@ { gchar buf[64]; - XGetErrorText(GDK_DISPLAY(), x_error_code, buf, sizeof(buf) - 1); + XGetErrorText(gdk_x11_get_default_xdisplay(), x_error_code, + buf, sizeof(buf) - 1); return g_strdup(buf); } @@ -267,7 +268,7 @@ } gdk_error_trap_push(); - XChangeDeviceProperty(GDK_DISPLAY(), + XChangeDeviceProperty(gdk_x11_get_default_xdisplay(), device, property_atom, XA_INTEGER, format_type, PropModeReplace, (unsigned char*)property_data, n_properties); @@ -377,7 +378,8 @@ if (!device) return -1; - properties = XListDeviceProperties(GDK_DISPLAY(), device, &n_properties); + properties = XListDeviceProperties(gdk_x11_get_default_xdisplay(), + device, &n_properties); for (i = 0; i < n_properties; i++) { const gchar *name; @@ -421,9 +423,9 @@ return FALSE; gdk_error_trap_push(); - status = XGetDeviceProperty(GDK_DISPLAY(), device, atom, 0, 1000, False, - XA_INTEGER, &actual_type, &actual_format, - n_values, &bytes_after, &data); + status = XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, atom, + 0, 1000, False, XA_INTEGER, &actual_type, + &actual_format, n_values, &bytes_after, &data); gdk_flush(); x_error_code = gdk_error_trap_pop(); if (status != Success || x_error_code != 0) { @@ -517,7 +519,7 @@ *(property_data + i) = (gfloat)properties[i]; gdk_error_trap_push(); - XChangeDeviceProperty(GDK_DISPLAY(), + XChangeDeviceProperty(gdk_x11_get_default_xdisplay(), device, property_atom, float_atom, 32, PropModeReplace, (unsigned char*)property_data, n_properties); @@ -588,7 +590,8 @@ return FALSE; gdk_error_trap_push(); - status = XGetDeviceProperty(GDK_DISPLAY(), device, property_atom, 0, 1000, False, + status = XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, + property_atom, 0, 1000, False, float_atom, &actual_type, &actual_format, n_properties, &bytes_after, &data); gdk_flush(); @@ -670,7 +673,8 @@ *map = g_new0(guchar, *n_buttons); gdk_error_trap_push(); - status = XGetDeviceButtonMapping(GDK_DISPLAY(), device, *map, *n_buttons); + status = XGetDeviceButtonMapping(gdk_x11_get_default_xdisplay(), + device, *map, *n_buttons); gdk_flush(); x_error_code = gdk_error_trap_pop(); @@ -699,7 +703,8 @@ return FALSE; gdk_error_trap_push(); - status = XSetDeviceButtonMapping(GDK_DISPLAY(), device, map, n_buttons); + status = XSetDeviceButtonMapping(gdk_x11_get_default_xdisplay(), + device, map, n_buttons); gdk_flush(); x_error_code = gdk_error_trap_pop(); diff -ru gpointing-device-settings-1.5.1-orig/src/gpds-xinput-pointer-info.c gpointing-device-settings-1.5.1/src/gpds-xinput-pointer-info.c --- gpointing-device-settings-1.5.1-orig/src/gpds-xinput-pointer-info.c 2009-08-15 04:24:43.000000000 -0400 +++ gpointing-device-settings-1.5.1/src/gpds-xinput-pointer-info.c 2010-11-01 03:33:30.176114396 -0400 @@ -55,7 +55,8 @@ XDeviceInfo *device_infos; gint i, n_device_infos; - device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos); + device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), + &n_device_infos); for (i = 0; i < n_device_infos; i++) { GpdsXInputPointerInfo *info; diff -ru gpointing-device-settings-1.5.1-orig/src/gpds-xinput-utils.c gpointing-device-settings-1.5.1/src/gpds-xinput-utils.c --- gpointing-device-settings-1.5.1-orig/src/gpds-xinput-utils.c 2009-07-03 19:25:31.000000000 -0400 +++ gpointing-device-settings-1.5.1/src/gpds-xinput-utils.c 2010-11-01 03:34:12.645114396 -0400 @@ -41,7 +41,8 @@ XDeviceInfo *device_infos; gint i, n_device_infos; - device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos); + device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), + &n_device_infos); for (i = 0; i < n_device_infos; i++) { if (device_infos[i].use != IsXExtensionPointer) @@ -98,7 +99,7 @@ return NULL; gdk_error_trap_push(); - device = XOpenDevice(GDK_DISPLAY(), device_info->id); + device = XOpenDevice(gdk_x11_get_default_xdisplay(), device_info->id); gdk_error_trap_pop(); if (!device) { g_set_error(error, diff -ru gpointing-device-settings-1.5.1-orig/test/test-xinput-utils.c gpointing-device-settings-1.5.1/test/test-xinput-utils.c --- gpointing-device-settings-1.5.1-orig/test/test-xinput-utils.c 2009-10-03 19:14:47.000000000 -0400 +++ gpointing-device-settings-1.5.1/test/test-xinput-utils.c 2010-11-01 03:34:43.989114397 -0400 @@ -28,7 +28,7 @@ teardown (void) { if (device) - XCloseDevice(GDK_DISPLAY(), device); + XCloseDevice(gdk_x11_get_default_xdisplay(), device); g_clear_error(&error); g_clear_error(&expected_error); }