diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2015-04-13 14:36:35 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2015-04-13 14:38:24 +0200 |
| commit | 6365dafd925aa7f1203bb87a930e6d4fd2eb6682 (patch) | |
| tree | 0e559fc42fcf878abd90b3c6cee441d256e6d91e | |
| parent | b24bfa819742019506d3bda1c3ba09789c8d5298 (diff) | |
| download | gnome-control-center-6365dafd925aa7f1203bb87a930e6d4fd2eb6682.tar.gz | |
wacom: Sync gsd-wacom-device.[ch] with g-s-d
And use the GdkDevice getter where it applies.
| -rw-r--r-- | panels/wacom/cc-wacom-page.c | 4 | ||||
| -rw-r--r-- | panels/wacom/gsd-wacom-device.c | 6 | ||||
| -rw-r--r-- | panels/wacom/gsd-wacom-device.h | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c index 812d673d3..561a608a3 100644 --- a/panels/wacom/cc-wacom-page.c +++ b/panels/wacom/cc-wacom-page.c @@ -224,7 +224,7 @@ run_calibration (CcWacomPage *page, old_axis.y_max = cal[3]; priv = page->priv; - g_object_get (priv->stylus, "gdk-device", &gdk_device, NULL); + gdk_device = gsd_wacom_device_get_gdk_device (priv->stylus); if (gdk_device != NULL) g_object_get (gdk_device, "device-id", &device_id, NULL); @@ -484,7 +484,7 @@ map_buttons_button_clicked_cb (GtkButton *button, priv = page->priv; - g_object_get (priv->pad, "gdk-device", &gdk_device, NULL); + gdk_device = gsd_wacom_device_get_gdk_device (priv->pad); g_return_if_fail (gdk_device != NULL); diff --git a/panels/wacom/gsd-wacom-device.c b/panels/wacom/gsd-wacom-device.c index b10944494..52d660006 100644 --- a/panels/wacom/gsd-wacom-device.c +++ b/panels/wacom/gsd-wacom-device.c @@ -2107,6 +2107,12 @@ gsd_wacom_device_rotation_type_to_name (GsdWacomRotation type) return "none"; } +GdkDevice * +gsd_wacom_device_get_gdk_device (GsdWacomDevice *device) +{ + return device->priv->gdk_device; +} + GsdWacomDevice * gsd_wacom_device_create_fake (GsdWacomDeviceType type, const char *name, diff --git a/panels/wacom/gsd-wacom-device.h b/panels/wacom/gsd-wacom-device.h index dcb51440b..374eca91d 100644 --- a/panels/wacom/gsd-wacom-device.h +++ b/panels/wacom/gsd-wacom-device.h @@ -180,6 +180,8 @@ int gsd_wacom_device_get_current_mode (GsdWacomDevice *device, int group_id); int gsd_wacom_device_set_next_mode (GsdWacomDevice *device, GsdWacomTabletButton *button); +GdkDevice * gsd_wacom_device_get_gdk_device (GsdWacomDevice *device); + GsdWacomRotation gsd_wacom_device_rotation_name_to_type (const char *rotation); const char * gsd_wacom_device_rotation_type_to_name (GsdWacomRotation type); |