filechooser: Also convert get_uris() to returning native paths

It was only being done in gtk_file_chooser_get_uri().

Signed-off-by: Federico Mena Quintero <federico@gnome.org>

1 files changed, 23 insertions, 11 deletions

diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 820db562bf..141e8bf76e 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -1201,6 +1201,22 @@ files_to_strings (GSList  *files,
   return g_slist_reverse (strings);
 }
 
+static gchar *
+file_to_uri_with_native_path (GFile *file)
+{
+  gchar *result = NULL;
+  gchar *native;
+
+  native = g_file_get_path (file);
+  if (native)
+    {
+      result = g_filename_to_uri (native, NULL, NULL); /* NULL-GError */
+      g_free (native);
+    }
+
+  return result;
+}
+
 /**
  * gtk_file_chooser_get_filenames:
  * @chooser: a #GtkFileChooser
@@ -1367,18 +1383,10 @@ gtk_file_chooser_get_uri (GtkFileChooser *chooser)
   if (file)
     {
       if (gtk_file_chooser_get_local_only (chooser))
-        {
-           gchar *local = g_file_get_path (file);
-           if (local)
-             {
-               result = g_filename_to_uri (local, NULL, NULL);
-               g_free (local);
-             }
-        }
+	  result = file_to_uri_with_native_path (file);
       else 
-        {
           result = g_file_get_uri (file);
-        }
+
       g_object_unref (file);
     }
 
@@ -1547,7 +1555,11 @@ gtk_file_chooser_get_uris (GtkFileChooser *chooser)
 
   files = gtk_file_chooser_get_files (chooser);
 
-  result = files_to_strings (files, g_file_get_uri);
+  if (gtk_file_chooser_get_local_only (chooser))
+    result = files_to_strings (files, file_to_uri_with_native_path);
+  else
+    result = files_to_strings (files, g_file_get_uri);
+
   g_slist_foreach (files, (GFunc) g_object_unref, NULL);
   g_slist_free (files);