applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

universal-access: Update to g-s-d mouse schema changes

Browse source 
The settings used here moved to the org.gnome.desktop.peripherals.mouse
schema, out of g-s-d. Stop referencing this unused schema.
This commit is contained in:
Carlos Garnacho 2021-01-27 13:25:21 +01:00
parent a868a418f4
commit 006d0e6a63
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
panels/universal-access/cc-pointing-dialog.c
View file

@ -25,7 +25,6 @@
#define KEY_DWELL_TIME "dwell-time"
#define KEY_DWELL_THRESHOLD "dwell-threshold"
#define GSD_MOUSE_SETTINGS "org.gnome.settings-daemon.peripherals.mouse"
#define KEY_DOUBLE_CLICK_DELAY "double-click"
struct _CcPointingDialog
@ -42,7 +41,6 @@ struct _CcPointingDialog
GtkSwitch *secondary_click_switch;
GSettings *mouse_settings;
GSettings *gsd_mouse_settings;
};
G_DEFINE_TYPE (CcPointingDialog, cc_pointing_dialog, GTK_TYPE_DIALOG);
@ -53,7 +51,6 @@ cc_pointing_dialog_dispose (GObject *object)
CcPointingDialog *self = CC_POINTING_DIALOG (object);
g_clear_object (&self->mouse_settings);
g_clear_object (&self->gsd_mouse_settings);
G_OBJECT_CLASS (cc_pointing_dialog_parent_class)->dispose (object);
}
@ -84,7 +81,6 @@ cc_pointing_dialog_init (CcPointingDialog *self)
gtk_widget_init_template (GTK_WIDGET (self));
self->mouse_settings = g_settings_new (MOUSE_SETTINGS);
self->gsd_mouse_settings = g_settings_new (GSD_MOUSE_SETTINGS);
/* simulated secondary click */
g_settings_bind (self->mouse_settings, KEY_SECONDARY_CLICK_ENABLED,

8
panels/universal-access/cc-ua-panel.c
View file

@ -97,9 +97,6 @@
#define KEY_DWELL_CLICK_ENABLED "dwell-click-enabled"
#define KEY_DWELL_TIME "dwell-time"
#define KEY_DWELL_THRESHOLD "dwell-threshold"
/* gnome-settings-daemon settings */
#define GSD_MOUSE_SETTINGS "org.gnome.settings-daemon.peripherals.mouse"
#define KEY_DOUBLE_CLICK_DELAY "double-click"
#define SCROLL_HEIGHT 490
@ -154,7 +151,6 @@ struct _CcUaPanel
GSettings *mouse_settings;
GSettings *kb_desktop_settings;
GSettings *application_settings;
GSettings *gsd_mouse_settings;
GList *sections;
GList *sections_reverse;
@ -174,7 +170,6 @@ cc_ua_panel_dispose (GObject *object)
g_clear_object (&self->mouse_settings);
g_clear_object (&self->kb_desktop_settings);
g_clear_object (&self->application_settings);
g_clear_object (&self->gsd_mouse_settings);
g_clear_pointer (&self->sections, g_list_free);
g_clear_pointer (&self->sections_reverse, g_list_free);
@ -692,7 +687,7 @@ cc_ua_panel_init_mouse (CcUaPanel *self)
G_CALLBACK (update_click_assist_label), self, G_CONNECT_SWAPPED);
update_click_assist_label (self);
g_settings_bind (self->gsd_mouse_settings, "double-click",
g_settings_bind (self->mouse_settings, "double-click",
gtk_range_get_adjustment (GTK_RANGE (self->double_click_delay_scale)), "value",
G_SETTINGS_BIND_DEFAULT);
@ -712,7 +707,6 @@ cc_ua_panel_init (CcUaPanel *self)
self->kb_settings = g_settings_new (KEYBOARD_SETTINGS);
self->kb_desktop_settings = g_settings_new (KEYBOARD_DESKTOP_SETTINGS);
self->mouse_settings = g_settings_new (MOUSE_SETTINGS);
self->gsd_mouse_settings = g_settings_new (GSD_MOUSE_SETTINGS);
self->application_settings = g_settings_new (APPLICATION_SETTINGS);
cc_ua_panel_init_status (self);