diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 2 |
2 files changed, 8 insertions, 0 deletions
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 <danw@ximian.com> + + * 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 <fejj@ximian.com> * 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); |