Don't get_message_flags, because POP doesn't support it and it's pointless

	* mail-ops.c (do_fetch_mail): Don't get_message_flags, because
	POP doesn't support it and it's pointless anyway since we're
	setting deleted, not toggling it. call camel_folder_sync with
	expunge=TRUE so that the deletions are actually recorded.

svn path=/trunk/; revision=5450

2 files changed, 7 insertions, 6 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index edae194c17..cbff28d1a9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,7 +1,11 @@
 2000-09-15  Dan Winship  <danw@helixcode.com>
 
 	* mail-ops.c (do_fetch_mail): Fix the sense of the "keep on
-	server" check so we're not doing this backwards.
+	server" check so we're not doing this backwards. Don't
+	get_message_flags, because POP doesn't support it and it's
+	pointless anyway since we're setting deleted, not toggling it.
+	call camel_folder_sync with expunge=TRUE so that the deletions are
+	actually recorded.
 
 2000-09-15  Dan Winship  <danw@helixcode.com>
 
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index fd95cbaef9..e147709219 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -219,19 +219,16 @@ do_fetch_mail (gpointer in_data, gpointer op_data, CamelException *ex)
 			   what it's been copied to at least 1 folder - even if it's just
 			   the default (assuming we didn't get an exception) */
 			if (!input->keep_on_server && !camel_exception_is_set (ex)) {
-				guint32 flags;
-				
-				flags = camel_folder_get_message_flags (folder, uids->pdata[i]);
 				camel_folder_set_message_flags (folder, uids->pdata[i],
 								CAMEL_MESSAGE_DELETED,
-								~flags);
+								CAMEL_MESSAGE_DELETED);
 			}
 			camel_object_unref (CAMEL_OBJECT (message));
 		}
 		
 		gtk_object_unref (GTK_OBJECT (filter));
 		
-		camel_folder_sync (folder, FALSE, ex);
+		camel_folder_sync (folder, TRUE, ex);
 		
 		camel_folder_thaw (input->destination);