[gnome-settings-daemon/gnome-3-16] wacom: Read settings after connecting to changed::



commit 377a9ae5e4b2a7143350dbeb95e89b779188339c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Aug 3 14:19:41 2015 +0200

    wacom: Read settings after connecting to changed::
    
    According to GSettings docs, one must read after connecting to changed::
    in order to ensure the handler will trigger in the future.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753170

 plugins/wacom/gsd-wacom-manager.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index f0732bd..5750f6e 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -799,10 +799,6 @@ set_wacom_settings (GsdWacomManager *manager,
        if (type == WACOM_TYPE_PAD) {
                int id;
 
-               id = get_device_id (device);
-               reset_pad_buttons (device);
-               grab_button (id, TRUE, manager->priv->screen);
-
                buttons = gsd_wacom_device_get_buttons (device);
                for (l = buttons; l != NULL; l = l->next) {
                        GsdWacomTabletButton *button = l->data;
@@ -814,6 +810,10 @@ set_wacom_settings (GsdWacomManager *manager,
                }
                g_list_free (buttons);
 
+               id = get_device_id (device);
+               reset_pad_buttons (device);
+               grab_button (id, TRUE, manager->priv->screen);
+
                return;
        }
 



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