From 3e7f72daee618a6809d3dc4394ee4ec36c3bdb80 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 30 Jul 2008 14:48:36 +0000 Subject: [PATCH] Monotone-Parent: 1165312607d527eb60c2b51766e12ab7c53ef45a Monotone-Revision: 084f183f6d5029cf488bf44a8eb3bada2d201619 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-30T14:48:36 Monotone-Branch: ca.inverse.sogo --- UI/MailerUI/UIxMailFolderActions.m | 8 ++------ UI/MailerUI/product.plist | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m index 764e2e62c..00905351b 100644 --- a/UI/MailerUI/UIxMailFolderActions.m +++ b/UI/MailerUI/UIxMailFolderActions.m @@ -272,12 +272,8 @@ [co flushMailCaches]; connection = [co imap4Connection]; subfolders = [[co allFolderURLs] objectEnumerator]; - currentURL = [subfolders nextObject]; - while (currentURL) - { - [connection deleteMailboxAtURL: currentURL]; - currentURL = [subfolders nextObject]; - } + while ((currentURL = [subfolders nextObject])) + [connection deleteMailboxAtURL: currentURL]; } if (error) { diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist index 27ef5d7fc..632104c29 100644 --- a/UI/MailerUI/product.plist +++ b/UI/MailerUI/product.plist @@ -119,7 +119,7 @@ expunge = { protectedBy = "View"; actionClass = "UIxMailFolderActions"; - actionName = "emptyTrash"; + actionName = "expunge"; }; createFolder = { protectedBy = "View";