[pluma] 02/18: debian/patches: Drop 0003_glib243-compat.patch, applied upstream.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository pluma.

commit 4ecfa73940b483b355b5196bda5d1c310e9ea8ae
Author: Martin Wimpress <code at flexion.org>
Date:   Tue Aug 4 09:30:12 2015 +0100

    debian/patches: Drop 0003_glib243-compat.patch, applied upstream.
---
 debian/patches/0003_glib243-compat.patch | 93 --------------------------------
 debian/patches/series                    |  1 -
 2 files changed, 94 deletions(-)

diff --git a/debian/patches/0003_glib243-compat.patch b/debian/patches/0003_glib243-compat.patch
deleted file mode 100644
index 390caa6..0000000
--- a/debian/patches/0003_glib243-compat.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From ffe784498722cf160a836caed201e1de4ac9fded Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Thu, 19 Mar 2015 17:24:55 +0300
-Subject: [PATCH] filebrowser plugin: first connect to settings, then read
- them.
-
-fixes the issue with GLib >= 2.43,
-https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
----
- plugins/filebrowser/pluma-file-browser-plugin.c | 54 ++++++++++++++-----------
- 1 file changed, 30 insertions(+), 24 deletions(-)
-
---- a/plugins/filebrowser/pluma-file-browser-plugin.c
-+++ b/plugins/filebrowser/pluma-file-browser-plugin.c
-@@ -312,6 +312,18 @@
- 	data->confirm_trash = enable;
- }
- 
-+static gboolean
-+have_click_policy (void)
-+{
-+	GSettings *settings = g_settings_new (CAJA_SCHEMA);
-+	gchar *pref = g_settings_get_string (settings, CAJA_CLICK_POLICY_KEY);
-+	gboolean result = (pref != NULL);
-+
-+	g_free (pref);
-+	g_object_unref (settings);
-+	return result;
-+}
-+
- static void
- install_caja_prefs (PlumaFileBrowserPluginData *data)
- {
-@@ -320,41 +332,35 @@
- 	PlumaFileBrowserViewClickPolicy policy;
- 	PlumaFileBrowserView *view;
- 
--	/* Get click_policy */
--	pref = g_settings_get_string (data->caja_settings, CAJA_CLICK_POLICY_KEY);
-+	if (have_click_policy ()) {
-+		g_signal_connect (data->caja_settings,
-+		                  "changed::" CAJA_CLICK_POLICY_KEY,
-+		                  G_CALLBACK (on_click_policy_changed),
-+		                  data);
-+	}
-+
-+	g_signal_connect (data->caja_settings,
-+	                  "changed::" CAJA_ENABLE_DELETE_KEY,
-+	                  G_CALLBACK (on_enable_delete_changed),
-+	                  data);
-+
-+	g_signal_connect (data->caja_settings,
-+	                  "changed::" CAJA_CONFIRM_TRASH_KEY,
-+	                  G_CALLBACK (on_confirm_trash_changed),
-+	                  data);
- 
-+	pref = g_settings_get_string (data->caja_settings, CAJA_CLICK_POLICY_KEY);
- 	policy = click_policy_from_string (pref);
-+	g_free (pref);
- 
- 	view = pluma_file_browser_widget_get_browser_view (data->tree_widget);
- 	pluma_file_browser_view_set_click_policy (view, policy);
- 
--	if (pref) {
--		g_signal_connect (data->caja_settings,
--						  "changed::" CAJA_CLICK_POLICY_KEY,
--						  G_CALLBACK (on_click_policy_changed),
--						  data);
--		g_free (pref);
--	}
--
--	/* Get enable_delete */
- 	prefb = g_settings_get_boolean (data->caja_settings, CAJA_ENABLE_DELETE_KEY);
--
- 	g_object_set (G_OBJECT (data->tree_widget), "enable-delete", prefb, NULL);
- 
--	g_signal_connect (data->caja_settings,
--					  "changed::" CAJA_ENABLE_DELETE_KEY,
--					  G_CALLBACK (on_enable_delete_changed),
--					  data);
--
--	/* Get confirm_trash */
- 	prefb = g_settings_get_boolean (data->caja_settings, CAJA_CONFIRM_TRASH_KEY);
--
- 	data->confirm_trash = prefb;
--
--	g_signal_connect (data->caja_settings,
--					  "changed::" CAJA_CONFIRM_TRASH_KEY,
--					  G_CALLBACK (on_confirm_trash_changed),
--					  data);
- }
- 
- static void
diff --git a/debian/patches/series b/debian/patches/series
index e945567..e3ea6a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0003_glib243-compat.patch
 1001_no-timestamped-gzip-files.patch
 2001_fix-man-page-errors.patch
 2002_omit-gfdl-licensed-help-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/pluma.git