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

[Bastien Nocera <hadess src gnome org>]

commit 49065829ba6efd877ebe76021a8b871b4b525237
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 28 15:55:35 2014 +0100

    wacom: Update from gnome-settings-daemon

 panels/wacom/gsd-wacom-device.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/panels/wacom/gsd-wacom-device.c b/panels/wacom/gsd-wacom-device.c
index 12204e1..14c3a21 100644
--- a/panels/wacom/gsd-wacom-device.c
+++ b/panels/wacom/gsd-wacom-device.c
@@ -1603,14 +1603,27 @@ gsd_wacom_device_class_init (GsdWacomDeviceClass *klass)
 static void
 gsd_wacom_device_init (GsdWacomDevice *device)
 {
+        char *per_user_config;
+
         device->priv = GSD_WACOM_DEVICE_GET_PRIVATE (device);
         device->priv->type = WACOM_TYPE_INVALID;
 
+        per_user_config = g_build_filename (g_get_user_config_dir (), "gnome-settings-daemon", 
"no-per-machine-config", NULL);
+        if (g_file_test (per_user_config, G_FILE_TEST_EXISTS)) {
+                g_free (per_user_config);
+                goto fallback;
+        }
+        g_free (per_user_config);
+
         if (g_file_get_contents ("/etc/machine-id", &device->priv->machine_id, NULL, NULL) == FALSE)
                 if (g_file_get_contents ("/var/lib/dbus/machine-id", &device->priv->machine_id, NULL, NULL) 
== FALSE)
-                        device->priv->machine_id = g_strdup ("00000000000000000000000000000000");
+                        goto fallback;
 
         device->priv->machine_id = g_strstrip (device->priv->machine_id);
+        return;
+
+fallback:
+        device->priv->machine_id = g_strdup ("00000000000000000000000000000000");
 }
 
 static void