From 22bc71a66747ad9e024a1c34e154dca09c0eb62d Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 9 Mar 2004 19:47:09 +0000 Subject: [PATCH] Handle the returned parent_path being NULL. Fixes #136662. 2004-03-09 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned parent_path being NULL. Fixes #136662. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilechooserdefault.c | 4 +++- 6 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a4fa0556..9182cb28e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-03-09 Federico Mena Quintero + + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + 2004-03-09 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7a4fa0556..9182cb28e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-03-09 Federico Mena Quintero + + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + 2004-03-09 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7a4fa0556..9182cb28e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-03-09 Federico Mena Quintero + + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + 2004-03-09 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7a4fa0556..9182cb28e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-03-09 Federico Mena Quintero + + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + 2004-03-09 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7a4fa0556..9182cb28e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-03-09 Federico Mena Quintero + + * gtk/gtkfilechooserdefault.c (get_file_info): Handle the returned + parent_path being NULL. Fixes #136662. + 2004-03-09 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (shortcuts_drag_data_received_cb): diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 2affafef6..0e88ba76d 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 -- 2.43.2