From: Jeff Muizelaar <jrmuizel@nit.ca>
Date: Tue, 4 Jan 2005 15:53:49 +0000 (+0000)
Subject: use gnome_vfs_make_uri_from_shell_arg so that relative paths work from the
X-Git-Tag: EVINCE_0_1_0~26
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=a88a1cde73b054120966e67bc0ad361457c5b4d2;p=evince.git

use gnome_vfs_make_uri_from_shell_arg so that relative paths work from the

2005-01-04  Jeff Muizelaar  <jrmuizel@nit.ca>

        * shell/main.c (load_files):

        use gnome_vfs_make_uri_from_shell_arg so that relative paths work
        from the command line and because it seems more appropriate.
---

diff --git a/ChangeLog b/ChangeLog
index 3b26cef7..0a293c75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-04  Jeff Muizelaar  <jrmuizel@nit.ca>
+
+	* shell/main.c (load_files):
+
+	use gnome_vfs_make_uri_from_shell_arg so that relative paths work
+	from the command line and because it seems more appropriate.
+
 2005-01-04  Marco Pesenti Gritti  <marco@gnome.org>
 
 	* data/evince-ui.xml:
diff --git a/shell/main.c b/shell/main.c
index 3deac7a9..fcda1f1e 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -48,21 +48,15 @@ load_files (const char **files)
 	}
 
 	for (i = 0; files[i]; i++) {
-		const char *uri;
-		char *freeme = NULL;
-		char *scheme;
-
-		if ((scheme = gnome_vfs_get_uri_scheme (files[i])))
-			uri = files[i];
-		else
-			uri = freeme = gnome_vfs_get_uri_from_local_path (files[i]);
-			
+		char *uri;
+
+		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);		
+
 		window = GTK_WIDGET (ev_application_new_window (EV_APP));
 		gtk_widget_show (window);
 		ev_window_open (EV_WINDOW (window), uri);
 
-		g_free (scheme);
-		g_free (freeme);
+		g_free (uri);
         }
 }