1 files changed, 3 insertions, 9 deletions

diff --git a/src/fs/gnunet-fs-gtk-download.c b/src/fs/gnunet-fs-gtk-download.c
index ee6b1927..61b34419 100644
--- a/src/fs/gnunet-fs-gtk-download.c
+++ b/src/fs/gnunet-fs-gtk-download.c
@@ -74,7 +74,7 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
   }
   GNUNET_free_non_null (dc->filename);
   dc->filename =
-      GNUNET_GTK_filechooser_get_filename_loc (GTK_FILE_CHOOSER (dlc->dialog));
+      GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dlc->dialog));
   dc->is_recursive =
       (TRUE ==
        gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cb))) ? GNUNET_YES :
@@ -167,8 +167,7 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
                    (builder, "GNUNET_GTK_save_as_dialog"));
   if (dc->filename != NULL)
   {
-    char buf[1024];
-    char *buf_utf8;
+    char buf[FILENAME_MAX];
 
     if (NULL != getcwd (buf, sizeof (buf)))
     {
@@ -177,12 +176,7 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
         strcat (buf, DIR_SEPARATOR_STR);
         strcat (buf, dc->filename);
       }
-      buf_utf8 = GNUNET_GTK_from_loc_to_utf8 (buf);
-      if (buf_utf8 != NULL)
-      {
-        gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), buf_utf8);
-        GNUNET_free (buf_utf8);
-      }
+      gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), buf);
     }
   }
   dlc = g_new0 (struct dialog_context, 1);