From: Sergio Villar Senin <svillar@igalia.com>
Date: Wed, 7 Jan 2009 13:03:24 +0000 (+0000)
Subject: Fix for "leave on server" deletes
X-Git-Tag: git_migration_finished~856
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=f34695cc046a41df511b47a38e043679560893f4

Fix for "leave on server" deletes

pmo-trunk-r7070
---

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index e4bd9c6..30f1a57 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2773,13 +2773,14 @@ remove_msgs_async_cb (TnyFolder *folder,
 							account_name);	
 	account_proto = modest_tny_account_get_protocol_type (account);
 	g_object_unref (account);
-	
-	if (( (modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_proto) && !leave_on_server) ||
-	      modest_tny_folder_is_remote_folder (folder) == FALSE))
+
+	if ((modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, account_proto) && 
+	     !leave_on_server) ||
+	    !modest_tny_folder_is_remote_folder (folder))
 		expunge = TRUE;
 	else
 		expunge = FALSE;
-	
+
 	/* Sync folder */
 	tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, 
 			      NULL, self);