From 3bf2abab41c7178f5ea34be2cb10de1836ea6be2 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 5 Sep 2008 13:12:58 +0000 Subject: [PATCH] Monotone-Parent: 9d41cb8ec35d1bfd5bde3fc6d323bc42d41fffcd Monotone-Revision: d0dc408cde2d2c26295711b91f59760222260c54 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-09-05T13:12:58 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Mailer/SOGoMailFolder.m | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2c3b81d5e..8298567b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-09-05 Wolfgang Sourdeau + + * SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder + -expungeLastMarkedFolder]): do not perform the expunge if the + marked folder is the current folder. + 2008-09-04 Wolfgang Sourdeau * UI/MailPartViewers/UIxMailPartAlternativeViewer.m diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index 43886de3e..0fabcc1a6 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -319,7 +319,8 @@ static BOOL aclConformsToIMAPExt = NO; if (mailSettings) { expungeURL = [mailSettings objectForKey: @"folderForExpunge"]; - if (expungeURL) + if (expungeURL + && ![expungeURL isEqualToString: [self imap4URLString]]) { folderURL = [NSURL URLWithString: expungeURL]; if (![[self imap4Connection] expungeAtURL: folderURL])