sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

backends: Update pointer drag-threshold/double-click settings location

Browse source 
Following recent gsettings-desktop-schemas changes.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1416>
This commit is contained in:
Carlos Garnacho 2020-08-27 00:08:00 +02:00 committed by Marge Bot
parent ff43eb8745
commit 6011562aa9
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/backends/meta-input-settings.c
View file

@ -73,7 +73,6 @@ struct _MetaInputSettingsPrivate
GSettings *touchpad_settings; GSettings *touchpad_settings;
GSettings *trackball_settings; GSettings *trackball_settings;
GSettings *keyboard_settings; GSettings *keyboard_settings;
GSettings *gsd_settings;
GSettings *keyboard_a11y_settings; GSettings *keyboard_a11y_settings;
GSettings *mouse_a11y_settings; GSettings *mouse_a11y_settings;
@ -154,7 +153,6 @@ meta_input_settings_dispose (GObject *object)
g_clear_object (&priv->touchpad_settings); g_clear_object (&priv->touchpad_settings);
g_clear_object (&priv->trackball_settings); g_clear_object (&priv->trackball_settings);
g_clear_object (&priv->keyboard_settings); g_clear_object (&priv->keyboard_settings);
g_clear_object (&priv->gsd_settings);
g_clear_object (&priv->keyboard_a11y_settings); g_clear_object (&priv->keyboard_a11y_settings);
g_clear_object (&priv->mouse_a11y_settings); g_clear_object (&priv->mouse_a11y_settings);
g_clear_pointer (&priv->mappable_devices, g_hash_table_unref); g_clear_pointer (&priv->mappable_devices, g_hash_table_unref);
@ -1800,6 +1798,10 @@ meta_input_settings_init (MetaInputSettings *settings)
g_signal_connect (priv->mouse_settings, "changed", g_signal_connect (priv->mouse_settings, "changed",
G_CALLBACK (meta_input_settings_changed_cb), settings); G_CALLBACK (meta_input_settings_changed_cb), settings);
g_settings_bind (priv->mouse_settings, "double-click",
clutter_settings_get_default(), "double-click-time",
G_SETTINGS_BIND_GET);
priv->touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad"); priv->touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
g_signal_connect (priv->touchpad_settings, "changed", g_signal_connect (priv->touchpad_settings, "changed",
G_CALLBACK (meta_input_settings_changed_cb), settings); G_CALLBACK (meta_input_settings_changed_cb), settings);
@ -1812,12 +1814,6 @@ meta_input_settings_init (MetaInputSettings *settings)
g_signal_connect (priv->keyboard_settings, "changed", g_signal_connect (priv->keyboard_settings, "changed",
G_CALLBACK (meta_input_settings_changed_cb), settings); G_CALLBACK (meta_input_settings_changed_cb), settings);
priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
g_settings_bind (priv->gsd_settings, "double-click",
clutter_settings_get_default(), "double-click-time",
G_SETTINGS_BIND_GET);
priv->keyboard_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard"); priv->keyboard_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");
g_signal_connect (priv->keyboard_a11y_settings, "changed", g_signal_connect (priv->keyboard_a11y_settings, "changed",
G_CALLBACK (meta_input_keyboard_a11y_settings_changed), settings); G_CALLBACK (meta_input_keyboard_a11y_settings_changed), settings);

3
src/core/prefs.c
View file

@ -68,8 +68,7 @@
#define SCHEMA_MUTTER "org.gnome.mutter" #define SCHEMA_MUTTER "org.gnome.mutter"
#define SCHEMA_INTERFACE "org.gnome.desktop.interface" #define SCHEMA_INTERFACE "org.gnome.desktop.interface"
#define SCHEMA_INPUT_SOURCES "org.gnome.desktop.input-sources" #define SCHEMA_INPUT_SOURCES "org.gnome.desktop.input-sources"
#define SCHEMA_XSETTINGS "org.gnome.settings-daemon.plugins.xsettings" #define SCHEMA_MOUSE "org.gnome.desktop.peripherals.mouse"
#define SCHEMA_MOUSE "org.gnome.settings-daemon.peripherals.mouse"
#define SETTINGS(s) g_hash_table_lookup (settings_schemas, (s)) #define SETTINGS(s) g_hash_table_lookup (settings_schemas, (s))