diff options
| -rw-r--r-- | app-arch/engrampa/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/engrampa/files/engrampa-1.8.1-caja-schema-fix.patch | 89 |
2 files changed, 94 insertions, 1 deletions
diff --git a/app-arch/engrampa/ChangeLog b/app-arch/engrampa/ChangeLog index 4902d00c2e95..0dfb64a853e2 100644 --- a/app-arch/engrampa/ChangeLog +++ b/app-arch/engrampa/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-arch/engrampa # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.11 2015/07/13 01:05:04 np-hardass Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.12 2015/07/13 17:10:00 np-hardass Exp $ + + 13 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> + +files/engrampa-1.8.1-caja-schema-fix.patch: + Add missing filesdir, thanks to angry_vincent 13 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml: Fix typo in metadata.xml diff --git a/app-arch/engrampa/files/engrampa-1.8.1-caja-schema-fix.patch b/app-arch/engrampa/files/engrampa-1.8.1-caja-schema-fix.patch new file mode 100644 index 000000000000..2068046465da --- /dev/null +++ b/app-arch/engrampa/files/engrampa-1.8.1-caja-schema-fix.patch @@ -0,0 +1,89 @@ +From 49f97664d7fdfc7914245cb26f660cbedd36afa4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com> +Date: Thu, 2 Oct 2014 14:29:01 +0200 +Subject: [PATCH] Use Caja GSettings schema optionally + +Excludes changes to glib version in configure.ac + +This makes Caja dependency optional. + +Closes https://github.com/mate-desktop/engrampa/pull/60 +--- + configure.ac | 2 +- + src/fr-window.c | 34 ++++++++++++++++++++++++---------- + 2 files changed, 25 insertions(+), 11 deletions(-) + +diff --git a/src/fr-window.c b/src/fr-window.c +index f9ceef8..6994066 100644 +--- a/src/fr-window.c ++++ b/src/fr-window.c +@@ -638,7 +638,9 @@ fr_window_free_private_data (FrWindow *window) + _g_object_unref (window->priv->settings_ui); + _g_object_unref (window->priv->settings_general); + _g_object_unref (window->priv->settings_dialogs); +- _g_object_unref (window->priv->settings_caja); ++ ++ if (window->priv->settings_caja) ++ _g_object_unref (window->priv->settings_caja); + } + + +@@ -4598,11 +4600,13 @@ static gboolean + is_single_click_policy (FrWindow *window) + { + char *value; +- gboolean result; ++ gboolean result = FALSE; + +- value = g_settings_get_string (window->priv->settings_caja, CAJA_CLICK_POLICY); +- result = (value != NULL) && (strncmp (value, "single", 6) == 0); +- g_free (value); ++ if (window->priv->settings_caja) { ++ value = g_settings_get_string (window->priv->settings_caja, CAJA_CLICK_POLICY); ++ result = (value != NULL) && (strncmp (value, "single", 6) == 0); ++ g_free (value); ++ } + + return result; + } +@@ -5384,6 +5388,8 @@ fr_window_construct (FrWindow *window) + GtkToolItem *open_recent_tool_item; + GtkWidget *menu_item; + GError *error = NULL; ++ GSettingsSchemaSource *schema_source; ++ GSettingsSchema *caja_schema; + + /* data common to all windows. */ + +@@ -5401,7 +5407,13 @@ fr_window_construct (FrWindow *window) + window->priv->settings_ui = g_settings_new (ENGRAMPA_SCHEMA_UI); + window->priv->settings_general = g_settings_new (ENGRAMPA_SCHEMA_GENERAL); + window->priv->settings_dialogs = g_settings_new (ENGRAMPA_SCHEMA_DIALOGS); +- window->priv->settings_caja = g_settings_new (CAJA_SCHEMA); ++ ++ schema_source = g_settings_schema_source_get_default (); ++ caja_schema = g_settings_schema_source_lookup (schema_source, CAJA_SCHEMA, FALSE); ++ if (caja_schema) { ++ window->priv->settings_caja = g_settings_new (CAJA_SCHEMA); ++ g_settings_schema_unref (caja_schema); ++ } + + /* Create the application. */ + +@@ -5994,10 +6006,12 @@ fr_window_construct (FrWindow *window) + "changed::" PREF_LISTING_USE_MIME_ICONS, + G_CALLBACK (pref_use_mime_icons_changed), + window); +- g_signal_connect (window->priv->settings_caja, +- "changed::" CAJA_CLICK_POLICY, +- G_CALLBACK (pref_click_policy_changed), +- window); ++ ++ if (window->priv->settings_caja) ++ g_signal_connect (window->priv->settings_caja, ++ "changed::" CAJA_CLICK_POLICY, ++ G_CALLBACK (pref_click_policy_changed), ++ window); + + /* Give focus to the list. */ + |