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 3b26cef7de3377ffefb579d115790dca6553a893..0a293c759e3331d905f80267ccd294b5eb2a6ecc 100644 (file)
--- 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 3deac7a946f8e0fb25ec642491a473416360747d..fcda1f1e05addde63cd00e504579c1073350acd3 100644 (file)
--- 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);
         }
 }