Merge lp:~seb128/unity-settings-daemon/wacom_device_type into lp:unity-settings-daemon

[Sebastien Bacher]

wacom: backport upstream change to use correct device types

"GdkDevices aint' GsdWacomDevices, so lookup the latter from the former.
https://bugzilla.gnome.org/show_bug.cgi?id=719972"

wacom: backport upstream change to use correct device types

"GdkDevices aint' GsdWacomDevices, so lookup the latter from the former.
https://bugzilla.gnome.org/show_bug.cgi?id=719972"

[Lars Karlitski (larsu)]

Ack

review: Approve

=== modified file 'plugins/wacom/gsd-wacom-manager.c'
--- plugins/wacom/gsd-wacom-manager.c	2015-10-07 16:32:40 +0000
+++ plugins/wacom/gsd-wacom-manager.c	2015-10-22 11:03:27 +0000
@@ -1485,14 +1485,19 @@
                 devices = gdk_device_manager_list_devices (p->device_manager, GDK_DEVICE_TYPE_SLAVE);
                 for (l = devices; l != NULL; l = l->next) {
                         GsdWacomDeviceType type;
-
-                        type = gsd_wacom_device_get_device_type (l->data);
-                        if (type == WACOM_TYPE_PAD) {
-                                int id;
-
-                                id = get_device_id (l->data);
+                        GsdWacomDevice *device;
+                        int id;
+
+                        id = gdk_x11_device_get_id (l->data);
+                        device = device_id_to_device (manager, id);
+
+                        if (!device)
+                                continue;
+
+                        type = gsd_wacom_device_get_device_type (device);
+
+                        if (type == WACOM_TYPE_PAD)
                                 grab_button (id, FALSE, manager->priv->screens);
-                        }
                 }
                 g_list_free (devices);