diff options
| author | Monsta <[email protected]> | 2015-03-12 11:43:38 +0300 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2015-03-13 09:11:22 +0100 |
| commit | 49db011356cd0f1c52e4f5de790957bd52468591 (patch) | |
| tree | bfb0458246df0b7816204e9ac7ac90972b4935f9 | |
| parent | 921dfebf9f6e36dee14357484f79a91b0b23708c (diff) | |
| download | mate-utils-49db011356cd0f1c52e4f5de790957bd52468591.tar.bz2 mate-utils-49db011356cd0f1c52e4f5de790957bd52468591.tar.xz | |
baobab, gsearchtool: 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-utils/pull/94
| -rw-r--r-- | baobab/src/baobab.c | 16 | ||||
| -rw-r--r-- | gsearchtool/gsearchtool.c | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c index b73d9f9e..9f945d13 100644 --- a/baobab/src/baobab.c +++ b/baobab/src/baobab.c @@ -797,17 +797,17 @@ baobab_setup_excluded_locations (void) { gchar **uris; + g_signal_connect (baobab.prefs_settings, + "changed::" BAOBAB_SETTINGS_EXCLUDED_URIS, + G_CALLBACK (excluded_uris_changed), + NULL); + uris = g_settings_get_strv (baobab.prefs_settings, BAOBAB_SETTINGS_EXCLUDED_URIS); baobab_set_excluded_locations (uris); g_strfreev (uris); sanity_check_excluded_locations (); - - g_signal_connect (baobab.prefs_settings, - "changed::" BAOBAB_SETTINGS_EXCLUDED_URIS, - G_CALLBACK (excluded_uris_changed), - NULL); } static void @@ -829,14 +829,14 @@ baobab_setup_monitors (void) monitor_volume (); - enable = g_settings_get_boolean (baobab.prefs_settings, - BAOBAB_SETTINGS_MONITOR_HOME); - g_signal_connect (baobab.prefs_settings, "changed::" BAOBAB_SETTINGS_MONITOR_HOME, G_CALLBACK (baobab_settings_monitor_home_changed), NULL); + enable = g_settings_get_boolean (baobab.prefs_settings, + BAOBAB_SETTINGS_MONITOR_HOME); + monitor_home (enable); } diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/gsearchtool.c index b2e7aa68..757e8ca2 100644 --- a/gsearchtool/gsearchtool.c +++ b/gsearchtool/gsearchtool.c @@ -2983,17 +2983,17 @@ gsearchtool_setup_gsettings_notifications (GSearchWindow * gsearch) return; } + g_signal_connect (gsearch->caja_settings, + "changed::click-policy", + G_CALLBACK (single_click_to_activate_key_changed_cb), + gsearch); + /* Get value of caja click behavior (single or double click to activate items) */ click_to_activate_pref = g_settings_get_string (gsearch->caja_settings, "click-policy"); gsearch->is_search_results_single_click_to_activate = (strncmp (click_to_activate_pref, "single", 6) == 0) ? TRUE : FALSE; - g_signal_connect (gsearch->caja_settings, - "changed::click-policy", - G_CALLBACK (single_click_to_activate_key_changed_cb), - gsearch); - g_free (click_to_activate_pref); } |