diff options
| author | Bastien Nocera <hadess@hadess.net> | 2015-12-17 11:39:41 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2015-12-17 11:41:36 +0100 |
| commit | 1be6b1db115bcc3cfd91934334f69a30d41ce9ab (patch) | |
| tree | 02164d3888c1c6f2ed713890a485075681ae9c10 /plugins/mouse | |
| parent | 1fc2aabb64ebfc80349d7235dd2961f478eeabd8 (diff) | |
| download | gnome-settings-daemon-1be6b1db115bcc3cfd91934334f69a30d41ce9ab.tar.gz | |
mouse: Migrate scroll-method key to new edge-scrolling-enabled key
The scroll-method key was removed from the touchpad settings in
gsettings-desktop-schemas, so migrate the old key to the correct new
one.
https://bugzilla.gnome.org/show_bug.cgi?id=759559
Diffstat (limited to 'plugins/mouse')
| -rw-r--r-- | plugins/mouse/gsd-mouse-manager.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c index 70a85075..4ea3f215 100644 --- a/plugins/mouse/gsd-mouse-manager.c +++ b/plugins/mouse/gsd-mouse-manager.c @@ -1518,6 +1518,18 @@ map_send_events (GVariant *variant) } } +static GVariant * +map_edge_scrolling_enabled (GVariant *variant) +{ + GsdTouchpadScrollMethod method; + + method = g_variant_get_uint32 (variant); + if (method == GSD_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING) + return g_variant_new_boolean (TRUE); + else + return g_variant_new_boolean (FALSE); +} + static void migrate_mouse_settings (void) { @@ -1533,7 +1545,7 @@ migrate_mouse_settings (void) GsdSettingsMigrateEntry touchpad_entries[] = { { "disable-while-typing", NULL, NULL }, { "horiz-scroll-enabled", NULL, NULL }, - { "scroll-method", "scroll-method", NULL }, + { "scroll-method", "edge-scrolling-enabled", map_edge_scrolling_enabled }, { "tap-to-click", "tap-to-click", NULL }, { "touchpad-enabled", "send-events", map_send_events }, { "left-handed", "left-handed", NULL }, |