summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-02-19 17:36:25 +0300
committerStefano Karapetsas <[email protected]>2015-02-25 23:41:24 +0100
commit27954f902adfb2e3b446a5e08b0632c0b20f64bf (patch)
treefaf940183c196f494e66aee54fec6b8a3b1064b5
parentcd2927a6fd4a78cae585daccbd6321a3798d51bf (diff)
downloadmate-session-manager-27954f902adfb2e3b446a5e08b0632c0b20f64bf.tar.bz2
mate-session-manager-27954f902adfb2e3b446a5e08b0632c0b20f64bf.tar.xz
first connect to settings, then read them.
fixes the issue with GLib >= 2.43, https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619 Closes https://github.com/mate-desktop/mate-session-manager/pull/72
-rw-r--r--capplet/gsm-properties-dialog.c5
-rw-r--r--mate-session/gsm-autostart-app.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
index 98ea0fc..32f4aff 100644
--- a/capplet/gsm-properties-dialog.c
+++ b/capplet/gsm-properties-dialog.c
@@ -659,13 +659,14 @@ setup_dialog (GsmPropertiesDialog *dialog)
button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml,
CAPPLET_REMEMBER_WIDGET_NAME));
dialog->priv->remember_toggle = button;
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
- g_settings_get_boolean (dialog->priv->settings, SPC_AUTOSAVE_KEY));
+
g_signal_connect (dialog->priv->settings,
"changed::" SPC_AUTOSAVE_KEY,
G_CALLBACK (on_autosave_value_notify),
dialog);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+ g_settings_get_boolean (dialog->priv->settings, SPC_AUTOSAVE_KEY));
g_signal_connect (button,
"toggled",
G_CALLBACK (on_autosave_value_toggled),
diff --git a/mate-session/gsm-autostart-app.c b/mate-session/gsm-autostart-app.c
index 360cfae..41cdfb6 100644
--- a/mate-session/gsm-autostart-app.c
+++ b/mate-session/gsm-autostart-app.c
@@ -303,7 +303,6 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
goto out;
settings = g_settings_new_full (schema, NULL, NULL);
- retval = g_settings_get_boolean (settings, elems[1]);
g_settings_schema_unref (schema);
signal = g_strdup_printf ("changed::%s", elems[1]);
@@ -311,6 +310,8 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app,
G_CALLBACK (gsettings_condition_cb), app);
g_free (signal);
+ retval = g_settings_get_boolean (settings, elems[1]);
+
app->priv->condition_settings = settings;
out: