diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2015-08-03 14:19:41 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2015-08-03 17:51:19 +0200 |
| commit | 377a9ae5e4b2a7143350dbeb95e89b779188339c (patch) | |
| tree | c387ae2bbeba45693f2e9af487bc667acdd477ca | |
| parent | 6a5a62f7091816b310c95264d9593aadb9bada4d (diff) | |
| download | gnome-settings-daemon-377a9ae5e4b2a7143350dbeb95e89b779188339c.tar.gz | |
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
| -rw-r--r-- | 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 f0732bd7..5750f6e6 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; } |