From d1a99f9b9429f126659e6557763e013958be180c Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 1 Jun 2007 04:11:47 +0000
Subject: [PATCH] Monotone-Parent: eec670c1a42c0c0dc4d8fd262d9226a82b74a294
 Monotone-Revision: fab115ed2ae60866132f76c69f795a2388ec8672

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-01T04:11:47
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                 |  5 +++++
 UI/MailerUI/UIxMailView.m | 34 ++--------------------------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 109436461..45be185ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-06-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailView.m ([-isTrashingAllowed]): removed
+	useless method.
+	([-showMarkDeletedButton]): removed useless method.
+	([-showTrashButton]): removed useless method.
+
 	* SoObjects/Appointments/iCalEntityObject+SOGo.m
 	([iCalEntityObject -userIsParticipant:user]): new proxy method
 	that invoked isParticipant on self for each possible email
diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index 7a9027ab2..de312aa8d 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -97,37 +97,6 @@ static NSString *mailETag = nil;
                    [self objectTitle]];
 }
 
-/* expunge / delete setup and permissions */
-
-- (BOOL) isTrashingAllowed
-{
-  id trash;
-  
-  trash = [[[self clientObject] mailAccountFolder] 
-            trashFolderInContext:context];
-  if ([trash isKindOfClass:[NSException class]])
-    return NO;
-
-  return [trash isWriteAllowed];
-}
-
-- (BOOL) showMarkDeletedButton
-{
-  // TODO: we might also want to add a default to always show delete
-  if (![[self clientObject] isDeletionAllowed])
-    return NO;
-  
-  return [self isTrashingAllowed] ? NO : YES;
-}
-
-- (BOOL) showTrashButton
-{
-  if (![[self clientObject] isDeletionAllowed])
-    return NO;
-  
-  return [self isTrashingAllowed];
-}
-
 /* links (DUP to UIxMailPartViewer!) */
 
 - (NSString *)linkToEnvelopeAddress:(NGImap4EnvelopeAddress *)_address {
@@ -162,7 +131,8 @@ static NSString *mailETag = nil;
 
 /* actions */
 
-- (id)defaultAction {
+- (id) defaultAction
+{
   /* check etag to see whether we really must rerender */
   if (mailETag != nil ) {
     /*