[evolution-mapi] Bug #632142 - File->Empty Trash does not remove just deleted emails

[Milan Crha <mcrha src gnome org>]

commit a1eb90bcaab71e429980b155cbfb385644cc9582
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jan 11 13:24:56 2011 +0100

    Bug #632142 - File->Empty Trash does not remove just deleted emails

 src/camel/camel-mapi-folder.c                  |   31 ++++++++++++++++++++++++
 src/libexchangemapi/exchange-mapi-connection.c |    5 ++-
 2 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index c81a90a..8a0ba32 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -1178,6 +1178,27 @@ mapi_folder_expunge_sync (CamelFolder *folder,
 
 	if ((mapi_folder->type & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_TRASH) {
 		GError *mapi_error = NULL;
+		GPtrArray *folders;
+		gint ii;
+
+		/* get deleted messages from all active folders too */
+		folders = camel_object_bag_list (parent_store->folders);
+		for (ii = 0; ii < folders->len; ii++) {
+			CamelFolder *opened_folder = CAMEL_FOLDER (folders->pdata[ii]);
+			CamelMapiFolder *mf;
+
+			if (!opened_folder)
+				continue;
+
+			mf = CAMEL_MAPI_FOLDER (opened_folder);
+			if (mf && (mf->type & CAMEL_FOLDER_TYPE_MASK) != CAMEL_FOLDER_TYPE_TRASH) {
+				if (camel_folder_get_deleted_message_count (opened_folder) > 0)
+					camel_folder_synchronize_sync (opened_folder, TRUE, cancellable, NULL);
+			}
+
+			g_object_unref (opened_folder);
+		}
+		g_ptr_array_free (folders, TRUE);
 
 		camel_service_lock (CAMEL_SERVICE (mapi_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
 		status = exchange_mapi_connection_empty_folder (camel_mapi_store_get_exchange_connection (mapi_store), fid, 0, &mapi_error);
@@ -1450,6 +1471,7 @@ mapi_folder_synchronize_sync (CamelFolder *folder,
 	CamelMessageInfo *info = NULL;
 	CamelMapiMessageInfo *mapi_info = NULL;
 	CamelStore *parent_store;
+	CamelFolderChangeInfo *changes = NULL;
 
 	GSList *read_items = NULL, *unread_items = NULL, *to_free = NULL, *junk_items = NULL, *deleted_items = NULL, *l;
 	flags_diff_t diff, unset_flags;
@@ -1611,12 +1633,21 @@ mapi_folder_synchronize_sync (CamelFolder *folder,
 	for (l = deleted_items; l; l = l->next) {
 		gchar * deleted_msg_uid = g_strdup_printf ("%016" G_GINT64_MODIFIER "X%016" G_GINT64_MODIFIER "X", fid, *(mapi_id_t *)l->data);
 
+		if (!changes)
+			changes = camel_folder_change_info_new ();
+		camel_folder_change_info_remove_uid (changes, deleted_msg_uid);
+
 		camel_folder_summary_lock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 		camel_folder_summary_remove_uid (folder->summary, deleted_msg_uid);
 		camel_data_cache_remove(mapi_folder->cache, "cache", deleted_msg_uid, NULL);
 		camel_folder_summary_unlock (folder->summary, CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK);
 	}
 
+	if (changes) {
+		camel_folder_changed (folder, changes);
+		camel_folder_change_info_free (changes);
+	}
+
 	g_slist_free (read_items);
 	g_slist_free (unread_items);
 	g_slist_free (deleted_items);
diff --git a/src/libexchangemapi/exchange-mapi-connection.c b/src/libexchangemapi/exchange-mapi-connection.c
index a87dcb8..a8dfc55 100644
--- a/src/libexchangemapi/exchange-mapi-connection.c
+++ b/src/libexchangemapi/exchange-mapi-connection.c
@@ -3902,7 +3902,8 @@ exchange_mapi_rename_profile (const gchar *old_name, const gchar *new_name)
 	g_return_if_fail (old_name != NULL);
 	g_return_if_fail (new_name != NULL);
 
-	g_static_rec_mutex_lock (&profile_mutex);
+	/* do not use locking here, it's called with a lock held already */
+	/* g_static_rec_mutex_lock (&profile_mutex); */
 
 	RenameProfile (
 		#ifdef HAVE_LIBMAPI_CONTEXT_PARAM
@@ -3910,7 +3911,7 @@ exchange_mapi_rename_profile (const gchar *old_name, const gchar *new_name)
 		#endif
 		old_name, new_name);
 
-	g_static_rec_mutex_unlock (&profile_mutex);
+	/* g_static_rec_mutex_unlock (&profile_mutex); */
 }
 
 /* profile related functions - end */