summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-03-02 16:57:42 +0300
committerStefano Karapetsas <[email protected]>2015-03-13 15:51:16 +0100
commitb10f5922f62c3936c4a7c7d809dda6f8497a926a (patch)
tree61ecbcc491a4e667fbf5c398fb731172b9c1e168
parentd36b1b78797fa22476117e68b408d8d90e22166c (diff)
downloadmate-desktop-b10f5922f62c3936c4a7c7d809dda6f8497a926a.tar.bz2
mate-desktop-b10f5922f62c3936c4a7c7d809dda6f8497a926a.tar.xz
mate-thumbnail: 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-desktop/pull/162
-rw-r--r--libmate-desktop/mate-desktop-thumbnail.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
index 4a4e5d6..02bcaf2 100644
--- a/libmate-desktop/mate-desktop-thumbnail.c
+++ b/libmate-desktop/mate-desktop-thumbnail.c
@@ -790,9 +790,7 @@ mate_desktop_thumbnail_factory_init (MateDesktopThumbnailFactory *factory)
g_mutex_init (&priv->lock);
priv->settings = g_settings_new ("org.mate.thumbnailers");
- priv->disabled = g_settings_get_boolean (priv->settings, "disable-all");
- if (!priv->disabled)
- priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
+
g_signal_connect (priv->settings, "changed::disable-all",
G_CALLBACK (external_thumbnailers_disabled_all_changed_cb),
factory);
@@ -800,6 +798,11 @@ mate_desktop_thumbnail_factory_init (MateDesktopThumbnailFactory *factory)
G_CALLBACK (external_thumbnailers_disabled_changed_cb),
factory);
+ priv->disabled = g_settings_get_boolean (priv->settings, "disable-all");
+
+ if (!priv->disabled)
+ priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
+
if (!priv->disabled)
mate_desktop_thumbnail_factory_load_thumbnailers (factory);
}