From cc136a635333fe83c5fbeba58de1f6dd3f6168dc Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 30 Apr 2002 17:16:30 +0000 Subject: If the folder's permanent_flags don't include CAMEL_MESSAGE_DELETED, don't * mail-callbacks.c (delete_msg): If the folder's permanent_flags don't include CAMEL_MESSAGE_DELETED, don't do anything. (In particular, don't move the cursor.) svn path=/trunk/; revision=16645 --- mail/ChangeLog | 6 ++++++ mail/mail-callbacks.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/mail/ChangeLog b/mail/ChangeLog index bacd3e8416..44e9950ffb 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2002-04-30 Dan Winship + + * mail-callbacks.c (delete_msg): If the folder's permanent_flags + don't include CAMEL_MESSAGE_DELETED, don't do anything. (In + particular, don't move the cursor.) + 2002-04-29 Jeffrey Stedfast * message-tag-followup.c (message_tag_followup_append_message): diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index fb6ad2ff3b..067fb50564 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -2324,6 +2324,8 @@ delete_msg (GtkWidget *button, gpointer user_data) if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; + if (!(fb->folder->permanent_flags & CAMEL_MESSAGE_DELETED)) + return; deleted = flag_messages (fb, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN); -- cgit v1.2.3