From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Mon, 2 Jul 2007 06:55:03 +0000 (+0000)
Subject: * don't expunge messages after marking them as deleted
X-Git-Tag: git_migration_finished~3018
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=48c69c42c4df3d3608a3136db935d72e2a1deefe

* don't expunge messages after marking them as deleted

pmo-trunk-r2519
---

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index f2eb6c0..2855ab3 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -644,7 +644,7 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
 		header = tny_msg_get_header (draft_msg);
 		/* Remove the old draft expunging it */
 		tny_folder_remove_msg (folder, header, NULL);
-		tny_folder_sync (folder, TRUE, &(priv->error));
+		tny_folder_sync (folder, FALSE, &(priv->error));  /* FALSE --> don't expunge */
 		g_object_unref (header);
 	}
 	
@@ -1926,7 +1926,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 		tny_folder_remove_msg (folder, header, &(priv->error));
 		if (!priv->error) {
 			tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
-			tny_folder_sync(folder, TRUE, &(priv->error));
+			tny_folder_sync(folder, FALSE, &(priv->error)); /* FALSE --> don't expunge */
 		}
 	}
 
diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 10d4d41..fe09923 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -682,8 +682,8 @@ modest_folder_view_finalize (GObject *obj)
 
 	if (priv->cur_folder_store) {
 		if (TNY_IS_FOLDER(priv->cur_folder_store))
-			tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), TRUE, NULL);
-		        /* expunge the message */
+			tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL);
+		        /* FALSE --> expunge the message */
 
 		g_object_unref (priv->cur_folder_store);
 		priv->cur_folder_store = NULL;
@@ -1062,8 +1062,8 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 	/* Current folder was unselected */
 	if (priv->cur_folder_store) {
 		if (TNY_IS_FOLDER(priv->cur_folder_store))
-			tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), TRUE, NULL);
-		/* expunge the message */
+			tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL);
+		/* FALSE --> don't expunge the messages */
 
 		g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
 			       priv->cur_folder_store, FALSE);