From: Sergio Villar Senin <svillar@igalia.com>
Date: Tue, 20 Nov 2007 14:37:26 +0000 (+0000)
Subject: 	* Clean up some code
X-Git-Tag: git_migration_finished~2053
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=3e76fbbeef3f07785aa2e3894bc0ddeeb009826c

	* Clean up some code

pmo-trunk-r3780
---

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index ae8efe2..a82eccd 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2339,16 +2339,11 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 
 		modest_mail_operation_notify_start (self);
 
-		if (TNY_IS_CAMEL_IMAP_FOLDER (folder))
-/* 			tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* FALSE --> don't expunge *\/ */
-			tny_folder_sync (folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
-		else if (TNY_IS_CAMEL_POP_FOLDER (folder))
-/* 			tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /\* TRUE --> dont expunge *\/ */
-			tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+		if (TNY_IS_CAMEL_IMAP_FOLDER (folder) ||
+		    TNY_IS_CAMEL_POP_FOLDER (folder))
+			tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /* FALSE --> dont expunge */
 		else
-			/* local folders */
-/* 			tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /\* TRUE --> expunge *\/ */
-			tny_folder_sync (folder, TRUE, &(priv->error)); /* TRUE --> expunge */
+			tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */
 	}