wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #49 from City-busz/make-caja-optional 

Use Caja GSettings schema optionally
This commit is contained in:
Stefano Karapetsas 2014-01-02 11:57:42 -08:00
parent 7ceb8fe98b 97336e5a49
commit 557fda5b12
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -290,7 +290,7 @@ esac
PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
PKG_CHECK_MODULES(PLUMA, [ PKG_CHECK_MODULES(PLUMA, [
libxml-2.0 >= 2.5.0 libxml-2.0 >= 2.5.0
glib-2.0 >= 2.22.0 glib-2.0 >= 2.32.0
$GMODULE_ADD $GMODULE_ADD
gthread-2.0 >= 2.13.0 gthread-2.0 >= 2.13.0
gio-2.0 >= 2.26.0 gio-2.0 >= 2.26.0

12
plugins/filebrowser/pluma-file-browser-plugin.c
View File

@ -623,6 +623,7 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window)
GdkPixbuf * pixbuf; GdkPixbuf * pixbuf;
PlumaFileBrowserStore * store; PlumaFileBrowserStore * store;
gchar *data_dir; gchar *data_dir;
GSettingsSchemaSource *schema_source;
data = g_new0 (PlumaFileBrowserPluginData, 1); data = g_new0 (PlumaFileBrowserPluginData, 1);
@ -632,7 +633,6 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window)
data->settings = g_settings_new (FILE_BROWSER_SCHEMA); data->settings = g_settings_new (FILE_BROWSER_SCHEMA);
data->onload_settings = g_settings_new (FILE_BROWSER_ONLOAD_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); data->terminal_settings = g_settings_new (TERMINAL_SCHEMA);
g_signal_connect (data->tree_widget, g_signal_connect (data->tree_widget,
@ -689,7 +689,11 @@ impl_activate (PlumaPlugin * plugin, PlumaWindow * window)
restore_filter (data); restore_filter (data);
/* Install caja preferences */ /* 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 */ /* Connect signals to store the last visited location */
g_signal_connect (pluma_file_browser_widget_get_browser_view (data->tree_widget), 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->settings);
g_object_unref (data->onload_settings); g_object_unref (data->onload_settings);
g_object_unref (data->caja_settings);
g_object_unref (data->terminal_settings); g_object_unref (data->terminal_settings);
if (data->caja_settings)
g_object_unref (data->caja_settings);
remove_popup_ui (window); remove_popup_ui (window);
panel = pluma_window_get_side_panel (window); panel = pluma_window_get_side_panel (window);