[mate-user-share] 01/05: Drop 0001_mem-leak-fix.patch, 0002_array-out-of-bounds.patch. Both included in latest upstream release.

[Mike Gabriel]

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

sunweaver pushed a commit to annotated tag debian/1.8.1+dfsg1-1
in repository mate-user-share.

commit 6149f80caf56596deb38688ee1eddd5d72303f84
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 13 11:15:06 2015 +0100

    Drop 0001_mem-leak-fix.patch, 0002_array-out-of-bounds.patch. Both included in latest upstream release.
---
 debian/patches/0001_mem-leak-fix.patch        | 47 ---------------------------
 debian/patches/0002_array-out-of-bounds.patch | 47 ---------------------------
 debian/patches/series                         |  2 --
 3 files changed, 96 deletions(-)

diff --git a/debian/patches/0001_mem-leak-fix.patch b/debian/patches/0001_mem-leak-fix.patch
deleted file mode 100644
index 4092171..0000000
--- a/debian/patches/0001_mem-leak-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 18acac35d5015196431b5fc5f0291c860ea2ea1b Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Wed, 19 Nov 2014 21:22:41 +0300
-Subject: [PATCH] don't leak memory
-
----
- src/http.c            | 1 +
- src/share-extension.c | 6 +++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/http.c b/src/http.c
-index 71161cd..36d058a 100644
---- a/src/http.c
-+++ b/src/http.c
-@@ -397,6 +397,7 @@ spawn_httpd (int port, pid_t *pid_out)
- 		fprintf (stderr, "error spawning httpd: %s\n",
- 			 error->message);
- 		g_error_free (error);
-+		g_free (pid_filename);
- 		return FALSE;
- 	}
- 
-diff --git a/src/share-extension.c b/src/share-extension.c
-index bbc34ff..e0edbce 100644
---- a/src/share-extension.c
-+++ b/src/share-extension.c
-@@ -168,6 +168,8 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface,
- 		g_object_unref (dir);
- 	}
- 
-+	g_object_unref (file);
-+
- 	if (enable == FALSE)
- 		return NULL;
- 
-@@ -200,9 +202,7 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface,
- 
- 	gtk_widget_show_all (bar);
- 
--	g_object_unref (file);
--
--        return bar;
-+	return bar;
- }
- 
- static void
-
diff --git a/debian/patches/0002_array-out-of-bounds.patch b/debian/patches/0002_array-out-of-bounds.patch
deleted file mode 100644
index 3490da9..0000000
--- a/debian/patches/0002_array-out-of-bounds.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3e24f8f3a3afbbb15785ffc19623c020b4edc8a9 Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Wed, 19 Nov 2014 21:18:59 +0300
-Subject: [PATCH] fixed logic flaw (out-of-bounds array access if bluetooth is
- disabled)
-
----
- src/share-extension.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/share-extension.c b/src/share-extension.c
-index e0edbce..429d26d 100644
---- a/src/share-extension.c
-+++ b/src/share-extension.c
-@@ -145,7 +145,7 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface,
- 	const GUserDirectory special_dirs[] = { G_USER_DIRECTORY_PUBLIC_SHARE };
- 
- 	gboolean is_dir[] = { FALSE };
--#endif
-+#endif /* HAVE_BLUETOOTH */
- 	file = g_file_new_for_uri (uri);
- 	home = g_file_new_for_path (g_get_home_dir ());
- 
-@@ -173,14 +173,16 @@ caja_user_share_get_location_widget (CajaLocationWidgetProvider *iface,
- 	if (enable == FALSE)
- 		return NULL;
- 
--	if (is_dir[0] != FALSE && is_dir[1] != FALSE) {
--		bar = caja_share_bar_new (_("May be used to share or receive files"));
--	} else if (is_dir[0] != FALSE) {
--#ifndef HAVE_BLUETOOTH
--		bar = caja_share_bar_new (_("May be shared over the network or Bluetooth"));
-+	if (is_dir[0] != FALSE) {
-+#ifdef HAVE_BLUETOOTH
-+		if (is_dir[1] != FALSE) {
-+			bar = caja_share_bar_new (_("May be used to share or receive files"));
-+		} else {
-+			bar = caja_share_bar_new (_("May be shared over the network or Bluetooth"));
-+		}
- #else
- 		bar = caja_share_bar_new (_("May be shared over the network"));
--#endif /* !HAVE_BLUETOOTH */
-+#endif /* HAVE_BLUETOOTH */
- 	} else {
- #ifdef HAVE_BLUETOOTH
- 		BluetoothClient *client;
-
diff --git a/debian/patches/series b/debian/patches/series
index dcde3f7..6b09652 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-0001_mem-leak-fix.patch
-0002_array-out-of-bounds.patch
 1001_apache-config.patch
 1002_add-keywords-key-to-desktop-files.patch
 2001_omit-gfdl-licensed-help-files.patch

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