[gnome-disk-utility] Use set_current_folder_uri(), not set_current_folder()

[David Zeuthen <davidz src gnome org>]

commit dd5695ae69b3d95956ee3674949315b501ebec52
Author: David Zeuthen <zeuthen gmail com>
Date:   Thu Aug 23 12:05:30 2012 -0400

    Use set_current_folder_uri(), not set_current_folder()
    
    Also move the call gtk_file_chooser_set_local_only() to the common
    file chooser setup routine.
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 src/disks/gduwindow.c |    1 -
 src/libgdu/gduutils.c |    8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
index dd46650..9d2e569 100644
--- a/src/disks/gduwindow.c
+++ b/src/disks/gduwindow.c
@@ -727,7 +727,6 @@ gdu_window_show_attach_disk_image (GduWindow *window)
                                         _("_Attach"), GTK_RESPONSE_ACCEPT,
                                         NULL);
   gdu_utils_configure_file_chooser_for_disk_images (GTK_FILE_CHOOSER (dialog), TRUE);
-  gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE);
 
   /* Add a RO check button that defaults to RO */
   ro_checkbutton = gtk_check_button_new_with_mnemonic (_("Set up _read-only loop device"));
diff --git a/src/libgdu/gduutils.c b/src/libgdu/gduutils.c
index e444e1a..263576a 100644
--- a/src/libgdu/gduutils.c
+++ b/src/libgdu/gduutils.c
@@ -66,8 +66,9 @@ gdu_utils_configure_file_chooser_for_disk_images (GtkFileChooser *file_chooser,
   gchar *folder;
   GSettings *settings;
 
-  /* Get folder from GSettings, and default to the "Documents" folder */
+  gtk_file_chooser_set_local_only (file_chooser, FALSE);
 
+  /* Get folder from GSettings, and default to the "Documents" folder */
   settings = g_settings_new ("org.gnome.Disks");
   folder = g_settings_get_string (settings, "image-dir-uri");
   if (folder == NULL || strlen (folder) == 0)
@@ -76,10 +77,7 @@ gdu_utils_configure_file_chooser_for_disk_images (GtkFileChooser *file_chooser,
       folder = g_strdup_printf ("file://%s", g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
     }
   g_object_set_data_full (G_OBJECT (file_chooser), "x-gdu-orig-folder", g_strdup (folder), g_free);
-  if (g_str_has_prefix (folder, "file://"))
-    gtk_file_chooser_set_current_folder (file_chooser, folder + strlen ("file://"));
-  else
-    gtk_file_chooser_set_current_folder (file_chooser, folder);
+  gtk_file_chooser_set_current_folder_uri (file_chooser, folder);
 
   /* TODO: define proper mime-types */
   if (set_file_types)