common: Pass old default and allow resetting when migrating settings

This is required for migrating keybindings. In some cases, the old
default is now in a separate settings key, so we want to be able to
reset the setting even if the user had set it explicitly.

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index a3f0fc88..701f4af5 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -246,7 +246,7 @@ gsd_mouse_manager_finalize (GObject *object)
 }
 
 static GVariant *
-map_speed (GVariant *variant, GVariant *new_default)
+map_speed (GVariant *variant, GVariant *old_default, GVariant *new_default)
 {
         gdouble value;
 
@@ -259,7 +259,7 @@ map_speed (GVariant *variant, GVariant *new_default)
 }
 
 static GVariant *
-map_send_events (GVariant *variant, GVariant *new_default)
+map_send_events (GVariant *variant, GVariant *old_default, GVariant *new_default)
 {
         gboolean enabled;
 
@@ -273,7 +273,7 @@ map_send_events (GVariant *variant, GVariant *new_default)
 }
 
 static GVariant *
-map_edge_scrolling_enabled (GVariant *variant, GVariant *new_default)
+map_edge_scrolling_enabled (GVariant *variant, GVariant *old_default, GVariant *new_default)
 {
 	GsdTouchpadScrollMethod  method;