diff options
| author | Benjamin Berg <bberg@redhat.com> | 2019-03-07 14:35:15 +0100 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2019-05-27 16:48:25 +0200 |
| commit | 75bf9f5a20e97ee1943f815a20098dd17f45dbdb (patch) | |
| tree | 49c5348618feaa2941e09408483ca48f56d11483 /plugins/wacom | |
| parent | 11b989a9584bec68e09ad4d2f0a0b12f9f32b035 (diff) | |
| download | gnome-settings-daemon-75bf9f5a20e97ee1943f815a20098dd17f45dbdb.tar.gz | |
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.
Diffstat (limited to 'plugins/wacom')
| -rw-r--r-- | plugins/wacom/gsd-wacom-manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c index 7822c8e9..e1c8eaa7 100644 --- a/plugins/wacom/gsd-wacom-manager.c +++ b/plugins/wacom/gsd-wacom-manager.c @@ -118,7 +118,7 @@ G_DEFINE_TYPE (GsdWacomManager, gsd_wacom_manager, G_TYPE_OBJECT) static gpointer manager_object = NULL; static GVariant * -map_tablet_mapping (GVariant *value, GVariant *new_default) +map_tablet_mapping (GVariant *value, GVariant *old_default, GVariant *new_default) { const gchar *mapping; @@ -127,7 +127,7 @@ map_tablet_mapping (GVariant *value, GVariant *new_default) } static GVariant * -map_tablet_left_handed (GVariant *value, GVariant *new_default) +map_tablet_left_handed (GVariant *value, GVariant *old_default, GVariant *new_default) { const gchar *rotation = g_variant_get_string (value, NULL); return g_variant_new_boolean (g_strcmp0 (rotation, "half") == 0 || |