diff options
| author | Stefano Karapetsas <[email protected]> | 2015-03-12 20:53:15 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-03-12 20:53:15 +0100 |
| commit | 8e7c134d64dba2d0c8b689b89fa2ea9d0a89d891 (patch) | |
| tree | 9cf983ec4c07f42ef151aacc4463f6630d7d30ea /src/daemon | |
| parent | af208d20149f9e2a1047454843b16a45ef71511f (diff) | |
| parent | 2da0593cad0ef8ab3a05bffa48e5fccd02a2573a (diff) | |
| download | mate-notification-daemon-8e7c134d64dba2d0c8b689b89fa2ea9d0a89d891.tar.bz2 mate-notification-daemon-8e7c134d64dba2d0c8b689b89fa2ea9d0a89d891.tar.xz | |
Merge pull request #46 from monsta/fix-for-new-glib-1.8
[1.8] first connect to settings, then read them.
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/daemon.c | 4 | ||||
| -rw-r--r-- | src/daemon/engines.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index 239bd02..c285de2 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c @@ -364,12 +364,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"); |