From b442a3a4ea1efa589a2791a55f7b38819e14b563 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 30 Jun 2011 14:38:27 -0500 Subject: [PATCH] Return the recent-folder plus filename in Save mode from get_files() Since the GtkFileChooserEntry already gets the recent-folder set upon it when a recent-folder is selected, it already can give us the correct fully-formed path. Signed-off-by: Federico Mena Quintero --- gtk/gtkfilechooserdefault.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 91a516e046..2d4040574f 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -7287,15 +7287,23 @@ gtk_file_chooser_default_get_files (GtkFileChooser *chooser) GtkWidget *current_focus; gboolean file_list_seen; + info.impl = impl; + info.result = NULL; + info.file_from_entry = NULL; + if (impl->operation_mode == OPERATION_MODE_SEARCH) return search_get_selected_files (impl); if (impl->operation_mode == OPERATION_MODE_RECENT) - return recent_get_selected_files (impl); - - info.impl = impl; - info.result = NULL; - info.file_from_entry = NULL; + { + if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) + { + file_list_seen = TRUE; + goto file_entry; + } + else + return recent_get_selected_files (impl); + } toplevel = get_toplevel (GTK_WIDGET (impl)); if (toplevel)