summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2015-01-19 18:29:53 +0100
committerCarlos Garnacho <carlosg@gnome.org>2015-01-19 18:29:53 +0100
commit7fc7a0d8f4684800399624a1a65d6a88bfc864f7 (patch)
tree538d17fecc95d4586c629a401838326dedf891b1
parente1da6c900b008ddaea5cfb66c653e9d5087275c4 (diff)
downloadgnome-settings-daemon-7fc7a0d8f4684800399624a1a65d6a88bfc864f7.tar.gz
wacom: Protect x11-only code under gnome_settings_is_wayland() checks
Likewise to device_added_cb(), the X11 GsdDeviceManager calls should only be done in that platform.
-rw-r--r--plugins/wacom/gsd-wacom-manager.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index 458afbb2..6d83238e 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -1150,6 +1150,9 @@ device_removed_cb (GsdDeviceManager *device_manager,
gsd_device_mapper_remove_input (manager->priv->device_mapper,
gsd_device);
+ if (gnome_settings_is_wayland ())
+ return;
+
devices = gsd_x11_device_manager_get_gdk_devices (GSD_X11_DEVICE_MANAGER (device_manager),
gsd_device, &n_gdk_devices);