diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2005-11-29 01:15:13 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2005-11-29 01:15:13 +0000 |
| commit | 62ed8cb11504bb077f93b5e5d97ee561754642f0 (patch) | |
| tree | 2911ee3ceb1ad9fae9a37c62d6cccfda40d66d59 | |
| parent | 4ac1632f10d9b8bea9825d409018540856d0c87c (diff) | |
| download | gdk-pixbuf-62ed8cb11504bb077f93b5e5d97ee561754642f0.tar.gz | |
Fixes the critical warnings from bug #317999, thus fixing the bug
2005-11-28 Federico Mena Quintero <federico@ximian.com>
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.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 11 | ||||
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 2 |
3 files changed, 23 insertions, 1 deletions
@@ -1,5 +1,16 @@ 2005-11-28 Federico Mena Quintero <federico@ximian.com> + 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 <federico@ximian.com> + Fix bug #321560, based on a patch by Bogdan Nicula (bogdanni@hotmail.com): * gtk/gtkfilechooserdefault.c (up_folder_handler): Don't add the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 876bb3f96..f25ba7e56 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,16 @@ 2005-11-28 Federico Mena Quintero <federico@ximian.com> + 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 <federico@ximian.com> + Fix bug #321560, based on a patch by Bogdan Nicula (bogdanni@hotmail.com): * gtk/gtkfilechooserdefault.c (up_folder_handler): Don't add the diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index ebf4ddc0c..00a78a970 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -5701,7 +5701,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); |