gpointing-device-settings-git/fixes.patch

   1 Binary files gpointing-device-settings/modules/gnome-settings-daemon-plugins/.gsd-pointing-device-plugin.c.swp and gpointing-device-settings-build/modules/gnome-settings-daemon-plugins/.gsd-pointing-device-plugin.c.swp differ
   2 diff -Nru gpointing-device-settings/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c gpointing-device-settings-build/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
   3 --- gpointing-device-settings/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c        2012-01-21 18:46:24.770666951 -0500
   4 +++ gpointing-device-settings-build/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c  2012-01-21 19:08:25.383684958 -0500
   5 @@ -124,7 +124,7 @@
   6
   7      gint op_code, event, error;
   8
   9 -    if (!XQueryExtension(GDK_DISPLAY(),
  10 +    if (!XQueryExtension(gdk_x11_get_default_xdisplay(),
  11                           "XInputExtension",
  12                           &op_code,
  13                           &event,
  14 @@ -212,6 +212,11 @@
  15      plugin_class->activate = activate;
  16      plugin_class->deactivate = deactivate;
  17  }
  18 +
  19 +static void
  20 +gsd_pointing_device_plugin_class_finalize(GsdPointingDevicePluginClass *klass)
  21 +{
  22 +}
  23  /*
  24  vi:ts=4:nowrap:ai:expandtab:sw=4
  25  */
  26 diff -Nru gpointing-device-settings/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c gpointing-device-settings-build/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
  27 --- gpointing-device-settings/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c      2012-01-21 18:46:24.770666951 -0500
  28 +++ gpointing-device-settings-build/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c        2012-01-21 18:52:05.229671597 -0500
  29 @@ -348,7 +348,7 @@
  30
  31      gint op_code, event, error;
  32
  33 -    if (!XQueryExtension(GDK_DISPLAY(),
  34 +    if (!XQueryExtension(gdk_x11_get_default_xdisplay(),
  35                           "XInputExtension",
  36                           &op_code,
  37                           &event,
  38 diff -Nru gpointing-device-settings/src/gpds-xinput-pointer-info.c gpointing-device-settings-build/src/gpds-xinput-pointer-info.c
  39 --- gpointing-device-settings/src/gpds-xinput-pointer-info.c    2012-01-21 18:46:24.775666951 -0500
  40 +++ gpointing-device-settings-build/src/gpds-xinput-pointer-info.c      2012-01-21 18:54:37.300673676 -0500
  41 @@ -55,7 +55,7 @@
  42      XDeviceInfo *device_infos;
  43      gint i, n_device_infos;
  44
  45 -    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
  46 +    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), &n_device_infos);
  47
  48      for (i = 0; i < n_device_infos; i++) {
  49          GpdsXInputPointerInfo *info;
  50 diff -Nru gpointing-device-settings/src/gpds-xinput-utils.c gpointing-device-settings-build/src/gpds-xinput-utils.c
  51 --- gpointing-device-settings/src/gpds-xinput-utils.c   2012-01-21 18:46:24.775666951 -0500
  52 +++ gpointing-device-settings-build/src/gpds-xinput-utils.c     2012-01-21 18:59:37.311677761 -0500
  53 @@ -38,10 +38,12 @@
  54  XDeviceInfo *
  55  gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error)
  56  {
  57 +    if (!device_name)
  58 +        goto out_gpds_xinput_utils_get_device_info;
  59      XDeviceInfo *device_infos;
  60      gint i, n_device_infos;
  61
  62 -    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
  63 +    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), &n_device_infos);
  64
  65      for (i = 0; i < n_device_infos; i++) {
  66          if (device_infos[i].use != IsXExtensionPointer)
  67 @@ -54,6 +56,7 @@
  68
  69      XFreeDeviceList(device_infos);
  70
  71 +out_gpds_xinput_utils_get_device_info:
  72      g_set_error(error,
  73                  GPDS_XINPUT_UTILS_ERROR,
  74                  GPDS_XINPUT_UTILS_ERROR_NO_DEVICE,
  75 @@ -68,7 +71,7 @@
  76      XDeviceInfo *device_infos;
  77      gint i, n_device_infos;
  78
  79 -    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
  80 +    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), &n_device_infos);
  81
  82      for (i = 0; i < n_device_infos; i++) {
  83          if (device_infos[i].use != IsXExtensionPointer)
  84 @@ -125,7 +128,7 @@
  85          return NULL;
  86
  87      gdk_error_trap_push();
  88 -    device = XOpenDevice(GDK_DISPLAY(), device_info->id);
  89 +    device = XOpenDevice(gdk_x11_get_default_xdisplay(), device_info->id);
  90      gdk_error_trap_pop();
  91      if (!device) {
  92          g_set_error(error,
  93 diff -Nru gpointing-device-settings/src/gpds-xinput.c gpointing-device-settings-build/src/gpds-xinput.c
  94 --- gpointing-device-settings/src/gpds-xinput.c 2012-01-21 18:46:24.775666951 -0500
  95 +++ gpointing-device-settings-build/src/gpds-xinput.c   2012-01-21 18:54:10.448673303 -0500
  96 @@ -100,7 +100,7 @@
  97      g_free(priv->device_name);
  98
  99      if (priv->device) {
 100 -        XCloseDevice(GDK_DISPLAY(), priv->device);
 101 +        XCloseDevice(gdk_x11_get_default_xdisplay(), priv->device);
 102          priv->device = NULL;
 103      }
 104
 105 @@ -199,7 +199,7 @@
 106  {
 107      gchar buf[64];
 108
 109 -    XGetErrorText(GDK_DISPLAY(), x_error_code, buf, sizeof(buf) - 1);
 110 +    XGetErrorText(gdk_x11_get_default_xdisplay(), x_error_code, buf, sizeof(buf) - 1);
 111
 112      return g_strdup(buf);
 113  }
 114 @@ -273,7 +273,7 @@
 115      }
 116
 117      gdk_error_trap_push();
 118 -    XChangeDeviceProperty(GDK_DISPLAY(),
 119 +    XChangeDeviceProperty(gdk_x11_get_default_xdisplay(),
 120                            device, property_atom,
 121                            XA_INTEGER, format_type, PropModeReplace,
 122                            (unsigned char*)property_data, n_properties);
 123 @@ -383,7 +383,7 @@
 124      if (!device)
 125          return -1;
 126
 127 -    properties = XListDeviceProperties(GDK_DISPLAY(), device, &n_properties);
 128 +    properties = XListDeviceProperties(gdk_x11_get_default_xdisplay(), device, &n_properties);
 129      for (i = 0; i < n_properties; i++) {
 130          const gchar *name;
 131
 132 @@ -427,7 +427,7 @@
 133          return FALSE;
 134
 135      gdk_error_trap_push();
 136 -    status =  XGetDeviceProperty(GDK_DISPLAY(), device, atom, 0, 1000, False,
 137 +    status =  XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, atom, 0, 1000, False,
 138                                   XA_INTEGER, &actual_type, &actual_format,
 139                                   n_values, &bytes_after, &data);
 140      gdk_flush();
 141 @@ -523,7 +523,7 @@
 142          *(property_data + i) = (gfloat)properties[i];
 143
 144      gdk_error_trap_push();
 145 -    XChangeDeviceProperty(GDK_DISPLAY(),
 146 +    XChangeDeviceProperty(gdk_x11_get_default_xdisplay(),
 147                            device, property_atom,
 148                            float_atom, 32, PropModeReplace,
 149                            (unsigned char*)property_data, n_properties);
 150 @@ -594,7 +594,7 @@
 151          return FALSE;
 152
 153      gdk_error_trap_push();
 154 -    status =  XGetDeviceProperty(GDK_DISPLAY(), device, property_atom, 0, 1000, False,
 155 +    status =  XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, property_atom, 0, 1000, False,
 156                                   float_atom, &actual_type, &actual_format,
 157                                   n_properties, &bytes_after, &data);
 158      gdk_flush();
 159 @@ -676,7 +676,7 @@
 160      *map = g_new0(guchar, *n_buttons);
 161
 162      gdk_error_trap_push();
 163 -    status =  XGetDeviceButtonMapping(GDK_DISPLAY(), device, *map, *n_buttons);
 164 +    status =  XGetDeviceButtonMapping(gdk_x11_get_default_xdisplay(), device, *map, *n_buttons);
 165      gdk_flush();
 166
 167      x_error_code = gdk_error_trap_pop();
 168 @@ -705,7 +705,7 @@
 169          return FALSE;
 170
 171      gdk_error_trap_push();
 172 -    status =  XSetDeviceButtonMapping(GDK_DISPLAY(), device, map, n_buttons);
 173 +    status =  XSetDeviceButtonMapping(gdk_x11_get_default_xdisplay(), device, map, n_buttons);
 174      gdk_flush();
 175
 176      x_error_code = gdk_error_trap_pop();
 177 diff -Nru gpointing-device-settings/test/test-xinput-utils.c gpointing-device-settings-build/test/test-xinput-utils.c
 178 --- gpointing-device-settings/test/test-xinput-utils.c  2012-01-21 18:46:24.776666951 -0500
 179 +++ gpointing-device-settings-build/test/test-xinput-utils.c    2012-01-21 18:55:41.242674547 -0500
 180 @@ -29,7 +29,7 @@
 181  teardown (void)
 182  {
 183      if (device)
 184 -        XCloseDevice(GDK_DISPLAY(), device);
 185 +        XCloseDevice(gdk_x11_get_default_xdisplay(), device);
 186      g_clear_error(&error);
 187      g_clear_error(&expected_error);
 188  }