summaryrefslogtreecommitdiff
path: root/mate-session
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-02-19 17:59:49 +0300
committerStefano Karapetsas <[email protected]>2015-02-25 23:41:24 +0100
commitfa16a566b50e7bcaaba5e8da48f32868e704d0d8 (patch)
treea5026db32d9d6803018a18a269b395f39e11e685 /mate-session
parent955c94b22d584c82548ce5fb664d2fcf2537aaa7 (diff)
downloadmate-session-manager-fa16a566b50e7bcaaba5e8da48f32868e704d0d8.tar.bz2
mate-session-manager-fa16a566b50e7bcaaba5e8da48f32868e704d0d8.tar.xz
debug GSettings: first connect to settings, then read them.
fixes the issue with GLib >= 2.43, https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
Diffstat (limited to 'mate-session')
-rw-r--r--mate-session/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mate-session/main.c b/mate-session/main.c
index 385eddd..a221171 100644
--- a/mate-session/main.c
+++ b/mate-session/main.c
@@ -63,8 +63,8 @@
#define ACCESSIBILITY_KEY "accessibility"
#define ACCESSIBILITY_SCHEMA "org.mate.interface"
-#define DEBUG_KEY "mate-session"
#define DEBUG_SCHEMA "org.mate.debug"
+#define DEBUG_KEY "mate-session"
#define VISUAL_SCHEMA "org.mate.applications-at-visual"
#define VISUAL_KEY "exec"
@@ -588,15 +588,16 @@ int main(int argc, char** argv)
exit(1);
}
+ mdm_log_init();
+
/* Allows to enable/disable debug from GSettings only if it is not set from argument */
if (!debug && mate_gsettings_schema_exists(DEBUG_SCHEMA))
{
debug_settings = g_settings_new (DEBUG_SCHEMA);
- debug = g_settings_get_boolean (debug_settings, DEBUG_KEY);
g_signal_connect (debug_settings, "changed::" DEBUG_KEY, G_CALLBACK (debug_changed), NULL);
+ debug = g_settings_get_boolean (debug_settings, DEBUG_KEY);
}
- mdm_log_init();
mdm_log_set_debug(debug);
if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL)