added a special SoClass for the trash folder

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@688 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index 9f1b93f8fbc3c423ad280ddafab3a96ea7ad6982..6aaaa80d47fd30a420836fdfc5f1cd7ca43b0bd5 100644 (file)
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-07  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v0.9.90
+
+       * added specific SOGoTrashFolder.m class (subclass of SOGoMailFolder)
+         to allow hooking up a different UI
+
 2005-07-07  Helge Hess  <helge.hess@opengroupware.org>
 
        * SOGoMailAccounts.m: expose shared mailboxes retrieved via

diff --git a/SOGo/SoObjects/Mailer/GNUmakefile b/SOGo/SoObjects/Mailer/GNUmakefile
index 2aabb591665af33505ec1bbceadf3ca3113e1a0c..3072cb38fd9b7fd268d2e9e4213d86d3f6abdaa8 100644 (file)
--- a/SOGo/SoObjects/Mailer/GNUmakefile
+++ b/SOGo/SoObjects/Mailer/GNUmakefile
@@ -19,6 +19,7 @@ Mailer_OBJC_FILES += \
        SOGoMailFolder.m                \
        SOGoMailObject.m                \
        SOGoMailFolderDataSource.m      \
+       SOGoTrashFolder.m               \
        \
        SOGoMailBodyPart.m              \
        SOGoImageMailBodyPart.m         \

diff --git a/SOGo/SoObjects/Mailer/SOGoMailAccount.m b/SOGo/SoObjects/Mailer/SOGoMailAccount.m
index f2b7fd886422600ee36a1d39abdf81d6926df723..05fdcb478e37a9ac9c8ba359cf53bb19a034a0b2 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SOGo/SoObjects/Mailer/SOGoMailAccount.m
@@ -162,8 +162,14 @@ static BOOL     useAltNamespace   = NO;
 }
 
 - (id)lookupImap4Folder:(NSString *)_key inContext:(id)_cx {
-  return [self lookupFolder:_key ofClassNamed:@"SOGoMailFolder" inContext:_cx];
+  NSString *s;
+
+  s = [_key isEqualToString:[self trashFolderNameInContext:_cx]]
+    ? @"SOGoTrashFolder" : @"SOGoMailFolder";
+  
+  return [self lookupFolder:_key ofClassNamed:s inContext:_cx];
 }
+
 - (id)lookupDraftsFolder:(NSString *)_key inContext:(id)_ctx {
   return [self lookupFolder:_key ofClassNamed:@"SOGoDraftsFolder" 
               inContext:_ctx];

diff --git a/SOGo/SoObjects/Mailer/SOGoTrashFolder.h b/SOGo/SoObjects/Mailer/SOGoTrashFolder.h
new file mode 100644 (file)
index 0000000..c4089a8
--- /dev/null
+++ b/SOGo/SoObjects/Mailer/SOGoTrashFolder.h
@@ -0,0 +1,30 @@
+/*
+  Copyright (C) 2005 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+
+#ifndef __Mailer_SOGoTrashFolder_H__
+#define __Mailer_SOGoTrashFolder_H__
+
+#include <SoObjects/Mailer/SOGoMailFolder.h>
+
+@interface SOGoTrashFolder : SOGoMailFolder
+@end
+
+#endif /* __Mailer_SOGoTrashFolder_H__ */

diff --git a/SOGo/SoObjects/Mailer/SOGoTrashFolder.m b/SOGo/SoObjects/Mailer/SOGoTrashFolder.m
new file mode 100644 (file)
index 0000000..01cbd13
--- /dev/null
+++ b/SOGo/SoObjects/Mailer/SOGoTrashFolder.m
@@ -0,0 +1,33 @@
+/*
+  Copyright (C) 2005 SKYRIX Software AG
+
+  This file is part of OpenGroupware.org.
+
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+
+#include "SOGoTrashFolder.h"
+#include "common.h"
+
+@implementation SOGoTrashFolder
+
+/* folder type */
+
+- (NSString *)outlookFolderClass {
+  return @"IPF.Trash";
+}
+
+@end /* SOGoTrashFolder */

diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version
index 483a62f827a57a8cf36a8498cf29420729778ceb..cac8988756427ca4501602a22b5b97bc518baf7b 100644 (file)
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=89
+SUBMINOR_VERSION:=90
 
 # v0.9.69 requires libNGMime       v4.5.210
 # v0.9.55 requires libNGExtensions v4.5.136

diff --git a/SOGo/SoObjects/Mailer/product.plist b/SOGo/SoObjects/Mailer/product.plist
index 050854823c68cab2cb30cc7e801832e32a1f4124..2c8f73606ceb1d750f57e2aa349349c0e5eea832 100644 (file)
--- a/SOGo/SoObjects/Mailer/product.plist
+++ b/SOGo/SoObjects/Mailer/product.plist
@@ -30,6 +30,10 @@
       };
     };
 
+    SOGoTrashFolder = {
+      superclass    = "SOGoMailFolder";
+    };
+
     SOGoMailObject = {
       superclass    = "SOGoMailBaseObject";
     };