From 764f37acb5fbfdce47ab187660fa222afbf9670b Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 17 Aug 2007 02:20:38 +0000
Subject: [PATCH] Monotone-Parent: 502f48b359438710d34edd2abd4ba70a14b2865a
 Monotone-Revision: 970df33571464dbba1559ddd5794abaa1dd248c4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-17T02:20:38
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                     |  3 +++
 UI/MailerUI/UIxMailListView.m | 24 ------------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c3da09ebc..9a5829147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailListView.m ([-expungeAction]): removed
+	method, moved into the new UIxMailActions module class.
+
 	* SoObjects/Mailer/SOGoDraftsFolder.m ([SOGoDraftsFolder
 	-newDraft]): new method that returns a new SOGoDraftObject
 	instance with a unique filename based on the current timestamp and
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 41ba101bb..ae2758675 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -567,30 +567,6 @@ static int attachmentFlagSize = 8096;
   return [self redirectToLocation:@"view"];
 }
 
-- (id) expungeAction 
-{
-  // TODO: we might want to flush the caches?
-  NSException *error;
-  id clientObject;
-
-  clientObject = [self clientObject];
-  if (clientObject)
-    {
-      error = [clientObject expunge];
-      if (!error)
-	{
-	  if ([clientObject respondsToSelector: @selector(flushMailCaches)])
-	    [clientObject flushMailCaches];
-	  return [self redirectToLocation:@"view"];
-	}
-    }
-  else
-    error = [NSException exceptionWithHTTPStatus:404 /* Not Found */
-			 reason: @"did not find mail folder"];
-  
-  return error;
-}
-
 @end
 
 /* UIxMailListView */