[gnome-settings-daemon] wacom: Add tool name getter to helper



commit 0082136505767c28c7a25675311e8170fda626cc
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Nov 22 17:16:15 2011 +0000

    wacom: Add tool name getter to helper

 plugins/wacom/gsd-wacom-device.c |   13 +++++++++++++
 plugins/wacom/gsd-wacom-device.h |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-device.c b/plugins/wacom/gsd-wacom-device.c
index 84a1e31..2ae181f 100644
--- a/plugins/wacom/gsd-wacom-device.c
+++ b/plugins/wacom/gsd-wacom-device.c
@@ -151,6 +151,7 @@ struct GsdWacomDevicePrivate
 	GdkDevice *gdk_device;
 	GsdWacomDeviceType type;
 	char *name;
+	char *tool_name;
 	gboolean reversible;
 	gboolean is_screen_tablet;
 	GList *styli;
@@ -303,6 +304,7 @@ gsd_wacom_device_constructor (GType                     type,
 		if (device_info[i].id == id) {
 			device->priv->type = get_device_type (&device_info[i]);
 			device->priv->name = get_device_name (&device_info[i]);
+			device->priv->tool_name = g_strdup (device_info[i].name);
 			break;
 		}
 	}
@@ -405,6 +407,9 @@ gsd_wacom_device_finalize (GObject *object)
         g_free (p->name);
         p->name = NULL;
 
+        g_free (p->tool_name);
+        p->tool_name = NULL;
+
         G_OBJECT_CLASS (gsd_wacom_device_parent_class)->finalize (object);
 }
 
@@ -432,6 +437,14 @@ gsd_wacom_device_get_name (GsdWacomDevice *device)
 	return device->priv->name;
 }
 
+const char *
+gsd_wacom_device_get_tool_name (GsdWacomDevice *device)
+{
+	g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), NULL);
+
+	return device->priv->tool_name;
+}
+
 gboolean
 gsd_wacom_device_reversible (GsdWacomDevice *device)
 {
diff --git a/plugins/wacom/gsd-wacom-device.h b/plugins/wacom/gsd-wacom-device.h
index 35d82d2..d5d841f 100644
--- a/plugins/wacom/gsd-wacom-device.h
+++ b/plugins/wacom/gsd-wacom-device.h
@@ -86,6 +86,7 @@ GType gsd_wacom_device_get_type     (void);
 GsdWacomDevice * gsd_wacom_device_new              (GdkDevice *device);
 GList          * gsd_wacom_device_list_styli       (GsdWacomDevice *device);
 const char     * gsd_wacom_device_get_name         (GsdWacomDevice *device);
+const char     * gsd_wacom_device_get_tool_name    (GsdWacomDevice *device);
 gboolean         gsd_wacom_device_reversible       (GsdWacomDevice *device);
 gboolean         gsd_wacom_device_is_screen_tablet (GsdWacomDevice *device);
 GSettings      * gsd_wacom_device_get_settings     (GsdWacomDevice *device);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]