libgnomeui r5558 - in trunk: . file-chooser

[federico svn gnome org]

Author: federico
Date: Fri Mar  7 03:04:44 2008
New Revision: 5558
URL: http://svn.gnome.org/viewvc/libgnomeui?rev=5558&view=rev

Log:
Fix race condition when getting folders
2008-03-06  Federico Mena Quintero  <federico novell com>

	* file-chooser/gtkfilesystemgnomevfs.c
	(get_folder_complete_operation): Patch from Michael Meeks
	<michael meeks novell com> for
	http://bugzilla.gnome.org/show_bug.cgi?id=520767 - fix a race
	condition when two threads request the same folder and it's not
	loaded yet --- the last one to get the folder wouldn't get all the
	GtkFileInfoType flags it requested.

Signed-off-by: Federico Mena Quintero <federico gnu org>


Modified:
   trunk/ChangeLog
   trunk/file-chooser/gtkfilesystemgnomevfs.c

Modified: trunk/file-chooser/gtkfilesystemgnomevfs.c
==============================================================================
--- trunk/file-chooser/gtkfilesystemgnomevfs.c	(original)
+++ trunk/file-chooser/gtkfilesystemgnomevfs.c	Fri Mar  7 03:04:44 2008
@@ -1087,6 +1087,8 @@
       /* returned this cached folder */
       g_object_ref (folder_vfs);
 
+      folder_vfs->types |= op_data->types;
+
       (* op_data->callback) (GTK_FILE_SYSTEM_HANDLE (op_data->handle),
 			     GTK_FILE_FOLDER (folder_vfs), NULL,
 			     op_data->callback_data);