X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=ab4b8dfb9ab06fbda8701680168cd052a576eb66;hb=156da1afa7b81a00d6308bbf519db965db01fcf2;hp=8d057a04ddeb6590113b48c4dbe814201acfac7d;hpb=bf0e0b42ce9209f92f53604cb7799540b3eea7fa;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 8d057a04..ab4b8dfb 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -41,9 +41,6 @@
 #endif /* WITH_SMCLIENT */
 
 #ifdef G_OS_WIN32
-#ifdef DATADIR
-#undef DATADIR
-#endif
 #include <io.h>
 #include <conio.h>
 #if !(_WIN32_WINNT >= 0x0500)
@@ -95,8 +92,6 @@ launch_previewer (void)
 {
 	GString *cmd_str;
 	gchar   *cmd;
-	gint     argc;
-	gchar  **argv;
 	gboolean retval = FALSE;
 	GError  *error = NULL;
 
@@ -126,16 +121,16 @@ launch_previewer (void)
 	}
 
 	cmd = g_string_free (cmd_str, FALSE);
-	g_shell_parse_argv (cmd, &argc, &argv, &error);
-	g_free (cmd);
-	
+
 	if (!error) {
-		retval = gdk_spawn_on_screen (gdk_screen_get_default (),
-					      NULL, argv, NULL,
-					      G_SPAWN_SEARCH_PATH,
-					      NULL, NULL, NULL,
-					      &error);
-		g_strfreev (argv);
+		GAppInfo *app;
+
+		app = g_app_info_create_from_commandline (cmd, NULL, 0, &error);
+
+		if (app != NULL) {
+			retval = g_app_info_launch (app, NULL, NULL, &error);
+			g_object_unref (app);
+		}
 	}
 
 	if (error) {
@@ -143,6 +138,8 @@ launch_previewer (void)
 		g_error_free (error);
 	}
 
+	g_free (cmd);
+
 	return retval;
 }