From 382bf3a1133d9643f2c567351feecf4b8ca9404b Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 10 Mar 2004 05:19:29 +0000 Subject: [PATCH] Always check to see if the shortcuts exists. We don't want to put invalid Wed Mar 10 00:10:47 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always check to see if the shortcuts exists. We don't want to put invalid dirs in the shortcuts pane. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkfilechooserdefault.c | 15 ++++++++------- 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 375dd9f818..a2809e1745 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 10 00:10:47 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always + check to see if the shortcuts exists. We don't want to put + invalid dirs in the shortcuts pane. + Tue Mar 9 16:40:34 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 375dd9f818..a2809e1745 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Mar 10 00:10:47 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always + check to see if the shortcuts exists. We don't want to put + invalid dirs in the shortcuts pane. + Tue Mar 9 16:40:34 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 375dd9f818..a2809e1745 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Mar 10 00:10:47 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always + check to see if the shortcuts exists. We don't want to put + invalid dirs in the shortcuts pane. + Tue Mar 9 16:40:34 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 375dd9f818..a2809e1745 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Mar 10 00:10:47 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always + check to see if the shortcuts exists. We don't want to put + invalid dirs in the shortcuts pane. + Tue Mar 9 16:40:34 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 375dd9f818..a2809e1745 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Mar 10 00:10:47 2004 Jonathan Blandford + + * gtk/gtkfilechooserdefault.c (shortcuts_insert_path): Always + check to see if the shortcuts exists. We don't want to put + invalid dirs in the shortcuts pane. + Tue Mar 9 16:40:34 2004 Jonathan Blandford * gtk/gtkfilechooserdefault.c (struct _GtkFileChooserDefault): diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index cde440d3da..16b7fe61ec 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -869,16 +869,17 @@ shortcuts_insert_path (GtkFileChooserDefault *impl, } else { + /* Always check to make sure that the directory exists. */ + GtkFileInfo *info = get_file_info (impl->file_system, path, FALSE, error); + if (info == NULL) + return FALSE; + if (label) label_copy = g_strdup (label); else - { - GtkFileInfo *info = get_file_info (impl->file_system, path, TRUE, error); - if (!info) - return FALSE; - label_copy = g_strdup (gtk_file_info_get_display_name (info)); - gtk_file_info_free (info); - } + label_copy = g_strdup (gtk_file_info_get_display_name (info)); + + gtk_file_info_free (info); data = gtk_file_path_copy (path); pixbuf = gtk_file_system_render_icon (impl->file_system, path, GTK_WIDGET (impl),