Monotone-Parent: 9d41cb8ec35d1bfd5bde3fc6d323bc42d41fffcd

Monotone-Revision: d0dc408cde2d2c26295711b91f59760222260c54

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-09-05T13:12:58
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-09-05 13:12:58 +00:00
parent d82aaa6159
commit 3bf2abab41
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2008-09-05 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
-expungeLastMarkedFolder]): do not perform the expunge if the
marked folder is the current folder.
2008-09-04 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailPartViewers/UIxMailPartAlternativeViewer.m

View File

@ -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])