diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2004-03-09 19:47:09 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2004-03-09 19:47:09 +0000 |
| commit | 22bc71a66747ad9e024a1c34e154dca09c0eb62d (patch) | |
| tree | 7c4cddf618f39fe005308b446c9ea93a89a90338 | |
| parent | ace5e30238ee0bc5dfcc57196cb306389b3cc5f0 (diff) | |
| download | gtk+-22bc71a66747ad9e024a1c34e154dca09c0eb62d.tar.gz | |
Handle the returned parent_path being NULL. Fixes #136662.
2004-03-09 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned
parent_path being NULL. Fixes #136662.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 4 |
6 files changed, 28 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + +2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): Stop the emission so that GtkTreeView's handler won't try to poke the filter model. Fixes #136127. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7a4fa0556f..9182cb28e6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + +2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): Stop the emission so that GtkTreeView's handler won't try to poke the filter model. Fixes #136127. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7a4fa0556f..9182cb28e6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,10 @@ 2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + +2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): Stop the emission so that GtkTreeView's handler won't try to poke the filter model. Fixes #136127. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7a4fa0556f..9182cb28e6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + +2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): Stop the emission so that GtkTreeView's handler won't try to poke the filter model. Fixes #136127. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7a4fa0556f..9182cb28e6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + +2004-03-09 Federico Mena Quintero <federico@ximian.com> + * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): Stop the emission so that GtkTreeView's handler won't try to poke the filter model. Fixes #136127. diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 2affafef65..0e88ba76d9 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -757,10 +757,12 @@ get_file_info (GtkFileSystem *file_system, const GtkFilePath *path, gboolean nam GtkFileFolder *parent_folder; GtkFileInfo *info; + info = NULL; + if (!gtk_file_system_get_parent (file_system, path, &parent_path, error)) return NULL; - parent_folder = gtk_file_system_get_folder (file_system, parent_path, + parent_folder = gtk_file_system_get_folder (file_system, parent_path ? parent_path : path, GTK_FILE_INFO_DISPLAY_NAME #if 0 | GTK_FILE_INFO_ICON |