[gnome-settings-daemon] wacom: Protect x11-only code under gnome_settings_is_wayland() checks
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] wacom: Protect x11-only code under gnome_settings_is_wayland() checks
- Date: Mon, 19 Jan 2015 17:32:32 +0000 (UTC)
commit 7fc7a0d8f4684800399624a1a65d6a88bfc864f7
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Jan 19 18:29:53 2015 +0100
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.
plugins/wacom/gsd-wacom-manager.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index 458afbb..6d83238 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]