[gnome-control-center] wacom: Update from gnome-settings-daemon

[Bastien Nocera <hadess src gnome org>]

commit 555429009e5c5c8ab372d495056b1228fdee5a4b
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Mar 13 16:18:03 2015 +0100

    wacom: Update from gnome-settings-daemon

 panels/wacom/gsd-wacom-device.c |   27 +++++++++++++++++++++++++++
 panels/wacom/gsd-wacom-device.h |    1 +
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/panels/wacom/gsd-wacom-device.c b/panels/wacom/gsd-wacom-device.c
index 4c33052..2e0ea7b 100644
--- a/panels/wacom/gsd-wacom-device.c
+++ b/panels/wacom/gsd-wacom-device.c
@@ -1936,6 +1936,9 @@ gsd_wacom_device_get_default_area (GsdWacomDevice *device)
 
        g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), NULL);
 
+       if (!device->priv->gdk_device)
+               return NULL;
+
        g_object_get (device->priv->gdk_device, "device-id", &id, NULL);
 
        device_area = g_new0 (int, 4);
@@ -2227,3 +2230,27 @@ gsd_wacom_device_create_fake_intuos4 (void)
 
        return devices;
 }
+
+GList *
+gsd_wacom_device_create_fake_h610pro (void)
+{
+       GsdWacomDevice *device;
+       GList *devices;
+
+       device = gsd_wacom_device_create_fake (WACOM_TYPE_STYLUS,
+                                              "Huion H610 Pro",
+                                              "Huion H610 Pro stylus");
+       if (!device) {
+               g_warning ("Not appending Huion H610 Pro, libwacom is not new enough");
+               return NULL;
+       }
+
+       devices = g_list_prepend (NULL, device);
+
+       device = gsd_wacom_device_create_fake (WACOM_TYPE_PAD,
+                                              "Huion H610 Pro",
+                                              "Huion H610 Pro pad");
+       devices = g_list_prepend (devices, device);
+
+       return devices;
+}
diff --git a/panels/wacom/gsd-wacom-device.h b/panels/wacom/gsd-wacom-device.h
index dd3d439..dcb5144 100644
--- a/panels/wacom/gsd-wacom-device.h
+++ b/panels/wacom/gsd-wacom-device.h
@@ -193,6 +193,7 @@ GList * gsd_wacom_device_create_fake_cintiq   (void);
 GList * gsd_wacom_device_create_fake_bt       (void);
 GList * gsd_wacom_device_create_fake_x201     (void);
 GList * gsd_wacom_device_create_fake_intuos4  (void);
+GList * gsd_wacom_device_create_fake_h610pro  (void);
 
 G_END_DECLS