2 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 57776896..fe95bf6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,7 +290,7 @@ esac
 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
 PKG_CHECK_MODULES(PLUMA, [
 libxml-2.0 >= 2.5.0
- glib-2.0 >= 2.22.0
+ glib-2.0 >= 2.32.0
 $GMODULE_ADD
 gthread-2.0 >= 2.13.0
 gio-2.0 >= 2.26.0
diff --git a/plugins/filebrowser/pluma-file-browser-plugin.c b/plugins/filebrowser/pluma-file-browser-plugin.c
index 69b1e185..030ab783 100644
--- a/plugins/filebrowser/pluma-file-browser-plugin.c
+++ b/plugins/filebrowser/pluma-file-browser-plugin.c
@@ -623,6 +623,7 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window)
 GdkPixbuf * pixbuf;
 PlumaFileBrowserStore * store;
 gchar *data_dir;
+ GSettingsSchemaSource *schema_source;
 
 data = g_new0 (PlumaFileBrowserPluginData, 1);
 
@@ -632,7 +633,6 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window)
 
 data->settings = g_settings_new (FILE_BROWSER_SCHEMA);
 data->onload_settings = g_settings_new (FILE_BROWSER_ONLOAD_SCHEMA);
- data->caja_settings = g_settings_new (CAJA_SCHEMA);
 data->terminal_settings = g_settings_new (TERMINAL_SCHEMA);
 
 g_signal_connect (data->tree_widget,
@@ -689,7 +689,11 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window)
 restore_filter (data);
 
 /* Install caja preferences */
- install_caja_prefs (data);
+ schema_source = g_settings_schema_source_get_default();
+ if (g_settings_schema_source_lookup (schema_source, CAJA_SCHEMA, FALSE)) {
+ data->caja_settings = g_settings_new (CAJA_SCHEMA);
+ install_caja_prefs (data);
+ }
 
 /* Connect signals to store the last visited location */
 g_signal_connect (pluma_file_browser_widget_get_browser_view (data->tree_widget),
@@ -742,9 +746,11 @@ impl_deactivate (PlumaPlugin * plugin, PlumaWindow * window)
 
 g_object_unref (data->settings);
 g_object_unref (data->onload_settings);
- g_object_unref (data->caja_settings);
 g_object_unref (data->terminal_settings);
 
+ if (data->caja_settings)
+ g_object_unref (data->caja_settings);
+
 remove_popup_ui (window);
 
 panel = pluma_window_get_side_panel (window);