[atril] 01/13: debian/patches: Drop 0001_open-multiple-files.patch. Applied upstream.

Martin Wimpress flexiondotorg-guest at moszumanska.debian.org
Thu Jul 30 19:54:04 UTC 2015


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

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

commit 47b41ba8bf11791e935f86fdf8c22fcd1865d2c0
Author: Martin Wimpress <code at flexion.org>
Date:   Thu Jul 30 16:15:53 2015 +0100

    debian/patches: Drop 0001_open-multiple-files.patch. Applied upstream.
---
 debian/patches/0001_open-multiple-files.patch | 48 ---------------------------
 debian/patches/series                         |  1 -
 2 files changed, 49 deletions(-)

diff --git a/debian/patches/0001_open-multiple-files.patch b/debian/patches/0001_open-multiple-files.patch
deleted file mode 100644
index fb93646..0000000
--- a/debian/patches/0001_open-multiple-files.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cee6caa16804a4c4b539518b37d81c1470ca9270 Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Mon, 13 Oct 2014 16:20:51 +0200
-Subject: [PATCH] Uses g_app_info_launch_uris instead of g_app_info_launch to
- spawn other sessions
-
-Closes https://github.com/mate-desktop/atril/issues/86
-
-Solution comes from evince code
----
- shell/ev-application.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/shell/ev-application.c b/shell/ev-application.c
-index 220519d..da6366f 100644
---- a/shell/ev-application.c
-+++ b/shell/ev-application.c
-@@ -282,12 +282,13 @@ ev_spawn (const char     *uri,
- 		break;
- 	}
- 
--	g_string_append_printf (cmd, " %s", uri);
--
- 	cmdline = g_string_free (cmd, FALSE);
- 	app = g_app_info_create_from_commandline (cmdline, NULL, 0, &error);
- 
- 	if (app != NULL) {
-+		GList uri_list;
-+		GList *uris = NULL;
-+
- #if GTK_CHECK_VERSION (3, 0, 0)
- 		ctx = gdk_display_get_app_launch_context (gdk_screen_get_display (screen));
- #else
-@@ -297,7 +298,12 @@ ev_spawn (const char     *uri,
- 		gdk_app_launch_context_set_screen (ctx, screen);
- 		gdk_app_launch_context_set_timestamp (ctx, timestamp);
- 
--		g_app_info_launch (app, NULL, G_APP_LAUNCH_CONTEXT (ctx), &error);
-+		if (uri) {
-+			uri_list.data = (gchar *)uri;
-+			uri_list.prev = uri_list.next = NULL;
-+			uris = &uri_list;
-+		}
-+		g_app_info_launch_uris (app, uris, G_APP_LAUNCH_CONTEXT (ctx), &error);
- 
- 		g_object_unref (app);
- 		g_object_unref (ctx);
-
diff --git a/debian/patches/series b/debian/patches/series
index 4437a09..8f9df8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001_open-multiple-files.patch
 0002_forgotten-mutex-unlock.patch
 0003_bug-tracker-url.patch
 2001_omit-gfdl-licensed-help-files.patch

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



More information about the pkg-mate-commits mailing list