multitasking: Use Mutter settings for dynamic workspaces

The overrides weren't meant to be used like that.
This commit is contained in:
Georges Basile Stavracas Neto 2021-08-13 18:39:57 -03:00
parent 6e5169ad4d
commit ee355ee727

View file

@ -31,7 +31,6 @@ struct _CcMultitaskingPanel
GSettings *interface_settings; GSettings *interface_settings;
GSettings *mutter_settings; GSettings *mutter_settings;
GSettings *overrides_settings;
GSettings *shell_settings; GSettings *shell_settings;
GSettings *wm_settings; GSettings *wm_settings;
@ -56,7 +55,6 @@ cc_multitasking_panel_finalize (GObject *object)
g_clear_object (&self->interface_settings); g_clear_object (&self->interface_settings);
g_clear_object (&self->mutter_settings); g_clear_object (&self->mutter_settings);
g_clear_object (&self->overrides_settings);
g_clear_object (&self->shell_settings); g_clear_object (&self->shell_settings);
g_clear_object (&self->wm_settings); g_clear_object (&self->wm_settings);
@ -117,14 +115,12 @@ cc_multitasking_panel_init (CcMultitaskingPanel *self)
"active", "active",
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
self->overrides_settings = g_settings_new ("org.gnome.shell.overrides"); if (g_settings_get_boolean (self->mutter_settings, "dynamic-workspaces"))
if (g_settings_get_boolean (self->overrides_settings, "dynamic-workspaces"))
gtk_toggle_button_set_active (self->dynamic_workspaces_radio, TRUE); gtk_toggle_button_set_active (self->dynamic_workspaces_radio, TRUE);
else else
gtk_toggle_button_set_active (self->fixed_workspaces_radio, TRUE); gtk_toggle_button_set_active (self->fixed_workspaces_radio, TRUE);
g_settings_bind (self->overrides_settings, g_settings_bind (self->mutter_settings,
"dynamic-workspaces", "dynamic-workspaces",
self->dynamic_workspaces_radio, self->dynamic_workspaces_radio,
"active", "active",