Attachment 913714 Details for Bug 966658 – gnome-wacom-properties-bz966658.patch

[patch] gnome-wacom-properties-bz966658.patch

gnome-wacom-properties-bz966658.patch (text/plain), 1.31 KB, created by Siteshwar Vashisht on 2014-07-01 09:33:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Siteshwar Vashisht

Created: 2014-07-01 09:33:26 UTC

Size: 1.31 KB

patch

obsolete

>diff --git a/panels/wacom/gsd-wacom-device.c b/panels/wacom/gsd-wacom-device.c
>index ab9e2fe..bb06309 100644
>--- a/panels/wacom/gsd-wacom-device.c
>+++ b/panels/wacom/gsd-wacom-device.c
>@@ -1401,14 +1401,31 @@ 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;
> 
>+	/*
>+	Allow configuratrions to be shared across machines if ~/.config/gnome-settings-daemon/no-per-machine-config file
>+	exists
>+	*/
>+	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

Actions: View | Diff

Attachments on bug 966658: 913714