evolution-data-server r9735 - trunk/camel/providers/imap

[mcrha svn gnome org]

Author: mcrha
Date: Thu Nov  6 18:45:11 2008
New Revision: 9735
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9735&view=rev

Log:
2008-11-06  Milan Crha  <mcrha redhat com>

	** Fix for bug #558737

	* camel-imap-folder.c: (handle_copyuid_copy_user_tags),
	(imap_transfer_online): Do not use 'camel_folder_refresh_folder', use
	'imap_refresh_folder' instead, because the former locks the folder
	lock too, which could make a deadlock when we are refreshing that
	folder in other thread, which is waiting for the connect lock we hold.



Modified:
   trunk/camel/providers/imap/ChangeLog
   trunk/camel/providers/imap/camel-imap-folder.c

Modified: trunk/camel/providers/imap/camel-imap-folder.c
==============================================================================
--- trunk/camel/providers/imap/camel-imap-folder.c	(original)
+++ trunk/camel/providers/imap/camel-imap-folder.c	Thu Nov  6 18:45:11 2008
@@ -2158,7 +2158,7 @@
 	camel_exception_init (&ex);
 	/* refresh folder's summary first, we copied messages there on the server,
 	   but do not know about it in a local summary */
-	camel_folder_refresh_info (destination, &ex);
+	imap_refresh_info (destination, &ex);
 	if (camel_exception_is_set (&ex)) {
 		g_warning ("destination folder refresh failed, error: %s", ex.desc);
 		camel_exception_clear (&ex);
@@ -2304,7 +2304,7 @@
 	/* Make the destination notice its new messages */
 	if (store->current_folder != dest ||
 	    camel_folder_summary_count (dest->summary) == count)
-		camel_folder_refresh_info (dest, ex);
+		imap_refresh_info (dest, ex);
 	
 	/* FIXME */
 	if (transferred_uids)