From a868a418f451885c8397a3161b0d6ef56da988b7 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 27 Jan 2021 13:38:24 +0100 Subject: [PATCH 1/2] mouse: Drop unused g-s-d GSettings in test This went unnoticed, till g-s-d did actually drop that schema. Stop referencing this unused schema. --- panels/mouse/cc-mouse-test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/panels/mouse/cc-mouse-test.c b/panels/mouse/cc-mouse-test.c index e7e5c59cf..120d50279 100644 --- a/panels/mouse/cc-mouse-test.c +++ b/panels/mouse/cc-mouse-test.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include "cc-mouse-test.h" @@ -367,7 +366,7 @@ cc_mouse_test_init (CcMouseTest *self) self->double_click_state = DOUBLE_CLICK_TEST_OFF; self->button_state = 0; - self->mouse_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse"); + self->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse"); self->information_label_timeout_id = 0; self->button_drawing_area_timeout_id = 0; -- GitLab From 006d0e6a6311c12e2362883dc072b4d98de2ea69 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 27 Jan 2021 13:25:21 +0100 Subject: [PATCH 2/2] universal-access: Update to g-s-d mouse schema changes The settings used here moved to the org.gnome.desktop.peripherals.mouse schema, out of g-s-d. Stop referencing this unused schema. --- panels/universal-access/cc-pointing-dialog.c | 4 ---- panels/universal-access/cc-ua-panel.c | 8 +------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/panels/universal-access/cc-pointing-dialog.c b/panels/universal-access/cc-pointing-dialog.c index 910d87432..145867be0 100644 --- a/panels/universal-access/cc-pointing-dialog.c +++ b/panels/universal-access/cc-pointing-dialog.c @@ -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, diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c index b3d9c0039..0dd2bd3d2 100644 --- a/panels/universal-access/cc-ua-panel.c +++ b/panels/universal-access/cc-ua-panel.c @@ -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); -- GitLab