[gnome-settings-daemon] wacom: Make sure the touch property is set to a touch device



commit 20244839908ed4da8cea263ad490cf42bc5de26c
Author: Joaquim Rocha <jrocha redhat com>
Date:   Thu Jul 18 17:13:24 2013 +0200

    wacom: Make sure the touch property is set to a touch device
    
    Not filtering it would end up in setting it for the pad which closed the
    device and hence lost the current key grab.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=704480

 plugins/wacom/gsd-wacom-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index 49b92aa..20fd033 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -831,7 +831,8 @@ wacom_settings_changed (GSettings      *settings,
                if (type != WACOM_TYPE_PAD)
                        set_rotation (device, g_settings_get_enum (settings, key));
        } else if (g_str_equal (key, KEY_TOUCH)) {
-               set_touch (device, g_settings_get_boolean (settings, key));
+               if (type == WACOM_TYPE_TOUCH)
+                       set_touch (device, g_settings_get_boolean (settings, key));
        } else if (g_str_equal (key, KEY_TPCBUTTON)) {
                set_tpcbutton (device, g_settings_get_boolean (settings, key));
        } else if (g_str_equal (key, KEY_IS_ABSOLUTE)) {


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