From 13ed5fef8d451422b2ed314b453457f084cc44d5 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 29 Nov 2005 01:16:37 +0000 Subject: [PATCH] Merged from HEAD: 2005-11-28 Federico Mena Quintero Merged from HEAD: Fixes the critical warnings from bug #317999, thus fixing the bug completely: * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode, use _gtk_file_chooser_get_current_folder_path() instead of fetching the impl->current_folder directly. The latter may be null if we are in RELOAD_NONE state. --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ gtk/gtkfilechooserdefault.c | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6417041987..5e7089a0a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-11-28 Federico Mena Quintero + + Merged from HEAD: + + Fixes the critical warnings from bug #317999, thus fixing the bug + completely: + + * gtk/gtkfilechooserdefault.c + (gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode, + use _gtk_file_chooser_get_current_folder_path() instead of fetching the + impl->current_folder directly. The latter may be null if we are + in RELOAD_NONE state. + 2005-11-28 Federico Mena Quintero Merged from HEAD: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6417041987..5e7089a0a8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +2005-11-28 Federico Mena Quintero + + Merged from HEAD: + + Fixes the critical warnings from bug #317999, thus fixing the bug + completely: + + * gtk/gtkfilechooserdefault.c + (gtk_file_chooser_default_get_paths): In SELECT_FOLDER mode, + use _gtk_file_chooser_get_current_folder_path() instead of fetching the + impl->current_folder directly. The latter may be null if we are + in RELOAD_NONE state. + 2005-11-28 Federico Mena Quintero Merged from HEAD: diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 330712985a..01a1974141 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -5759,7 +5759,7 @@ gtk_file_chooser_default_get_paths (GtkFileChooser *chooser) if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && info.result == NULL) { - info.result = g_slist_prepend (info.result, gtk_file_path_copy (impl->current_folder)); + info.result = g_slist_prepend (info.result, _gtk_file_chooser_get_current_folder_path (chooser)); } return g_slist_reverse (info.result);