summaryrefslogtreecommitdiff
path: root/src/daemon
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-02-19 13:15:15 +0300
committerStefano Karapetsas <[email protected]>2015-03-02 22:00:46 +0100
commit36328f04582e5361ef06ab79109bacb7c7c33370 (patch)
tree925e08388b3281ae0e58f68396c4962ba0c43c01 /src/daemon
parent9eee34d8c5b7e40de416300857c19cda90bf92b9 (diff)
downloadmate-notification-daemon-36328f04582e5361ef06ab79109bacb7c7c33370.tar.bz2
mate-notification-daemon-36328f04582e5361ef06ab79109bacb7c7c33370.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-notification-daemon/pull/45
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/daemon.c4
-rw-r--r--src/daemon/engines.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index a702f78..a73ca93 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -360,12 +360,12 @@ static void notify_daemon_init(NotifyDaemon* daemon)
daemon->gsettings = g_settings_new (GSETTINGS_SCHEMA);
+ g_signal_connect (daemon->gsettings, "changed::" GSETTINGS_KEY_POPUP_LOCATION, G_CALLBACK (on_popup_location_changed), daemon);
+
location = g_settings_get_string (daemon->gsettings, GSETTINGS_KEY_POPUP_LOCATION);
daemon->priv->stack_location = get_stack_location_from_string(location);
g_free(location);
- g_signal_connect (daemon->gsettings, "changed::" GSETTINGS_KEY_POPUP_LOCATION, G_CALLBACK (on_popup_location_changed), daemon);
-
daemon->priv->n_screens = 0;
daemon->priv->screens = NULL;
diff --git a/src/daemon/engines.c b/src/daemon/engines.c
index 2217f28..6e841c2 100644
--- a/src/daemon/engines.c
+++ b/src/daemon/engines.c
@@ -169,13 +169,13 @@ static ThemeEngine* get_theme_engine(void)
if (active_engine == NULL)
{
GSettings* gsettings = g_settings_new (GSETTINGS_SCHEMA);
- char* enginename = g_settings_get_string(gsettings, GSETTINGS_KEY_THEME);
if (theme_prop_notify_id == 0)
{
theme_prop_notify_id = g_signal_connect (gsettings, "changed::" GSETTINGS_KEY_THEME, G_CALLBACK (theme_changed_cb), NULL);
}
+ char* enginename = g_settings_get_string(gsettings, GSETTINGS_KEY_THEME);
if (enginename == NULL)
{
active_engine = load_theme_engine("standard");