From 784e23d5240793615a1fa000cf3d49265d3f398d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 7 Oct 2004 05:01:41 +0000 Subject: [PATCH] Don't free info too early. (#154703, Morten Welinder) 2004-10-07 Matthias Clasen * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free info too early. (#154703, Morten Welinder) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilechooserdefault.c | 19 ++++++++----------- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a9de58d5f..6411e9dac1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-07 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free + info too early. (#154703, Morten Welinder) + 2004-10-06 Matthias Clasen * gtk/gtkfilechooserdefault.c (location_entry_create): Backport diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0a9de58d5f..6411e9dac1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-10-07 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free + info too early. (#154703, Morten Welinder) + 2004-10-06 Matthias Clasen * gtk/gtkfilechooserdefault.c (location_entry_create): Backport diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0a9de58d5f..6411e9dac1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-10-07 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free + info too early. (#154703, Morten Welinder) + 2004-10-06 Matthias Clasen * gtk/gtkfilechooserdefault.c (location_entry_create): Backport diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0a9de58d5f..6411e9dac1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-10-07 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (check_is_folder): Don't free + info too early. (#154703, Morten Welinder) + 2004-10-06 Matthias Clasen * gtk/gtkfilechooserdefault.c (location_entry_create): Backport diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 89afd0a1c4..d5fad5ae53 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1038,21 +1038,18 @@ check_is_folder (GtkFileSystem *file_system, const GtkFilePath *path, GError **e return FALSE; is_folder = gtk_file_info_get_is_folder (info); - gtk_file_info_free (info); if (!is_folder) - { - g_set_error (error, - GTK_FILE_SYSTEM_ERROR, - GTK_FILE_SYSTEM_ERROR_NOT_FOLDER, - "%s: %s", - gtk_file_info_get_display_name (info), - g_strerror (ENOTDIR)); + g_set_error (error, + GTK_FILE_SYSTEM_ERROR, + GTK_FILE_SYSTEM_ERROR_NOT_FOLDER, + "%s: %s", + gtk_file_info_get_display_name (info), + g_strerror (ENOTDIR)); - return FALSE; - } + gtk_file_info_free (info); - return TRUE; + return is_folder; } /* Inserts a path in the shortcuts tree, making a copy of it; alternatively,