If the folder is already open, add the requested info types to it.

2004-02-09  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilesystemunix.c (gtk_file_system_unix_get_folder): If
	the folder is already open, add the requested info types to it.

diff --git a/ChangeLog b/ChangeLog
index f28ad0437d55964c2d6e7f5e132200ac66fc8f87..a0133ef50df86653aba84846855dc3628726b030 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * 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  <yosh@gimp.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f28ad0437d55964c2d6e7f5e132200ac66fc8f87..a0133ef50df86653aba84846855dc3628726b030 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-02-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * 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  <yosh@gimp.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f28ad0437d55964c2d6e7f5e132200ac66fc8f87..a0133ef50df86653aba84846855dc3628726b030 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-02-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * 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  <yosh@gimp.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f28ad0437d55964c2d6e7f5e132200ac66fc8f87..a0133ef50df86653aba84846855dc3628726b030 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-02-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * 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  <yosh@gimp.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f28ad0437d55964c2d6e7f5e132200ac66fc8f87..a0133ef50df86653aba84846855dc3628726b030 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-02-09  Federico Mena Quintero  <federico@ximian.com>
+
+       * 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  <yosh@gimp.org>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_popup_widget): Add appropriate

diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
index 9f6db9b310a71b31b3ce60279e504ace102e5078..8d600ee12b8ebe41d61f7cfc3a079ae5bab31bb1 100644 (file)
--- 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);