aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-05-01 01:16:30 +0800
committerDan Winship <danw@src.gnome.org>2002-05-01 01:16:30 +0800
commitcc136a635333fe83c5fbeba58de1f6dd3f6168dc (patch)
treedd13ff03cef7c792a7c6bc297dddcc87e3b12091 /mail
parentf1cdb504e8a763113c629d806656eec6b7eca48e (diff)
downloadgsoc2013-evolution-cc136a635333fe83c5fbeba58de1f6dd3f6168dc.tar
gsoc2013-evolution-cc136a635333fe83c5fbeba58de1f6dd3f6168dc.tar.gz
gsoc2013-evolution-cc136a635333fe83c5fbeba58de1f6dd3f6168dc.tar.bz2
gsoc2013-evolution-cc136a635333fe83c5fbeba58de1f6dd3f6168dc.tar.lz
gsoc2013-evolution-cc136a635333fe83c5fbeba58de1f6dd3f6168dc.tar.xz
gsoc2013-evolution-cc136a635333fe83c5fbeba58de1f6dd3f6168dc.tar.zst
gsoc2013-evolution-cc136a635333fe83c5fbeba58de1f6dd3f6168dc.zip
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
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-callbacks.c2
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);