From 1e5b5f8b7ecb43d22007fa90f724d7dba3bcb98f Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 8 Aug 2002 05:40:00 +0000 Subject: Don't check permanent_flags for the CAMEL_MESSAGE_DELETED bit here, if we 2002-08-08 Jeffrey Stedfast * mail-callbacks.c (delete_msg): Don't check permanent_flags for the CAMEL_MESSAGE_DELETED bit here, if we are gonna check to see if the folder supports the permanent flag then there are better places to check this. Besides, it was the cause for bug #28038. svn path=/trunk/; revision=17740 --- mail/ChangeLog | 7 +++++++ mail/mail-callbacks.c | 1 + 2 files changed, 8 insertions(+) diff --git a/mail/ChangeLog b/mail/ChangeLog index 46216d903b..939cf82ffe 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2002-08-08 Jeffrey Stedfast + + * mail-callbacks.c (delete_msg): Don't check permanent_flags for + the CAMEL_MESSAGE_DELETED bit here, if we are gonna check to see + if the folder supports the permanent flag then there are better + places to check this. Besides, it was the cause for bug #28038. + 2002-08-08 Not Zed * folder-browser.c (folder_browser_toggle_threads): Force a diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 3cca63a197..2bd3b1075b 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -2544,6 +2544,7 @@ delete_msg (GtkWidget *button, gpointer user_data) if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; + if (!(fb->folder->permanent_flags & CAMEL_MESSAGE_DELETED)) return; -- cgit v1.2.3