File 0016-Use-g_spawn_command_line_async-to-launch-i... of Package mingw64-evince

Overview Repositories Revisions Requests Users Attributes Meta

File 0016-Use-g_spawn_command_line_async-to-launch-instances.patch of Package mingw64-evince (Revision 96b505698c7527abaf2662fc32ced578)

Currently displaying revision 96b505698c7527abaf2662fc32ced578 , Show latest

From 629cb1eb756078f525189d09f9ee3f46f34a07a8 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Fri, 8 Apr 2011 10:26:37 +0200
Subject: [PATCH 16/18] Use g_spawn_command_line_async() to launch instances

Work around for not working g_app_info_create_from_commandline () on
win32.
---
 shell/ev-application.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/shell/ev-application.c b/shell/ev-application.c
index c3320cd..f91aeae 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -239,15 +239,16 @@ ev_spawn (const char     *uri,
 	gchar *dir;
 
 	dir = g_win32_get_package_installation_directory_of_module (NULL);
-	path = g_build_filename (dir, "bin", "evince", NULL);
+	path = g_build_filename (dir, "bin", "evince.exe", NULL);
 
 	g_free (dir);
+	g_string_append_printf (cmd, "'%s'", path);
 }
 #else
 	path = g_build_filename (BINDIR, "evince", NULL);
+	g_string_append_printf (cmd, " %s", path);
 #endif
 
-	g_string_append_printf (cmd, " %s", path);
 	g_free (path);
 	
 	/* Page label */
@@ -280,6 +281,13 @@ ev_spawn (const char     *uri,
 		break;
 	}
 
+#ifdef G_OS_WIN32
+// Work around for not working g_app_info_create_from_commandline ();
+	g_string_append_printf (cmd, " %s", uri);
+	cmdline = g_string_free (cmd, FALSE);
+	g_spawn_command_line_async (cmdline, &error);
+#else
+
 	cmdline = g_string_free (cmd, FALSE);
 	app = g_app_info_create_from_commandline (cmdline, NULL, 0, &error);
 
@@ -304,6 +312,7 @@ ev_spawn (const char     *uri,
 		g_object_unref (app);
 		g_object_unref (ctx);
 	}
+#endif
 
 	if (error != NULL) {
 		g_warning ("Error launching evince %s: %s\n", uri, error->message);
-- 
1.7.4.1

Places

File 0016-Use-g_spawn_command_line_async-to-launch-instances.patch of Package mingw64-evince (Revision 96b505698c7527abaf2662fc32ced578)

Places