From 52383cbb58cc5db39354cc1554d35d98b4bc6266 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 9 Feb 2004 19:01:25 +0000 Subject: [PATCH] If the folder is already open, add the requested info types to it. 2004-02-09 Federico Mena Quintero * gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): If the folder is already open, add the requested info types to it. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilesystemunix.c | 5 ++++- 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f28ad0437d..a0133ef50d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-09 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): If + the folder is already open, add the requested info types to it. + Sun Feb 8 01:28:02 2004 Manish Singh * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f28ad0437d..a0133ef50d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-02-09 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): If + the folder is already open, add the requested info types to it. + Sun Feb 8 01:28:02 2004 Manish Singh * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f28ad0437d..a0133ef50d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2004-02-09 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): If + the folder is already open, add the requested info types to it. + Sun Feb 8 01:28:02 2004 Manish Singh * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f28ad0437d..a0133ef50d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-02-09 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): If + the folder is already open, add the requested info types to it. + Sun Feb 8 01:28:02 2004 Manish Singh * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f28ad0437d..a0133ef50d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-02-09 Federico Mena Quintero + + * gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): If + the folder is already open, add the requested info types to it. + Sun Feb 8 01:28:02 2004 Manish Singh * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 9f6db9b310..8d600ee12b 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -338,7 +338,10 @@ gtk_file_system_unix_get_folder (GtkFileSystem *file_system, folder_unix = g_hash_table_lookup (system_unix->folder_hash, filename); if (folder_unix) - return g_object_ref (folder_unix); + { + folder_unix->types |= types; + return g_object_ref (folder_unix); + } else { folder_unix = g_object_new (GTK_TYPE_FILE_FOLDER_UNIX, NULL);