From b19982774c13b81d0822dcbb1204ef1d346b648c Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 6 Feb 2005 21:35:40 +0000 Subject: [PATCH] assigned folder/message classes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@518 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/Appointments/ChangeLog | 5 +++++ SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m | 6 ++++++ SOGo/SoObjects/Appointments/SOGoAppointmentObject.m | 6 ++++++ SOGo/SoObjects/Appointments/Version | 2 +- SOGo/SoObjects/Contacts/ChangeLog | 5 +++++ SOGo/SoObjects/Contacts/SOGoContactFolder.m | 6 ++++++ SOGo/SoObjects/Contacts/SOGoContactObject.m | 6 ++++++ SOGo/SoObjects/Contacts/Version | 4 ++-- SOGo/SoObjects/Mailer/ChangeLog | 5 +++++ SOGo/SoObjects/Mailer/SOGoDraftsFolder.m | 6 ++++++ SOGo/SoObjects/Mailer/SOGoMailFolder.m | 7 +++++++ SOGo/SoObjects/Mailer/Version | 2 +- SOGo/SoObjects/SOGo/ChangeLog | 4 ++++ SOGo/SoObjects/SOGo/SOGoContentObject.h | 4 ++++ SOGo/SoObjects/SOGo/SOGoContentObject.m | 6 ++++++ SOGo/SoObjects/SOGo/SOGoFolder.h | 4 ++++ SOGo/SoObjects/SOGo/SOGoFolder.m | 9 +++++++-- SOGo/SoObjects/SOGo/Version | 4 ++-- SOGo/SoObjects/Sieve/ChangeLog | 5 +++++ SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m | 7 ++++++- SOGo/SoObjects/Sieve/SOGoSieveScriptsFolder.m | 6 ++++++ SOGo/SoObjects/Sieve/Version | 2 +- 22 files changed, 101 insertions(+), 10 deletions(-) diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog index b727ad48..a930ec03 100644 --- a/SOGo/SoObjects/Appointments/ChangeLog +++ b/SOGo/SoObjects/Appointments/ChangeLog @@ -1,3 +1,8 @@ +2005-02-06 Helge Hess + + * SOGoAppointmentObject.m, SOGoAppointmentFolder.m: added proper + message/folder class (v0.9.25) + 2004-11-09 Helge Hess * SOGoAppointmentObject.m: improved error handling in save method diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m index b70e5c12..cf3df43b 100644 --- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -486,4 +486,10 @@ static NSTimeZone *MET = nil; return r; } +/* folder type */ + +- (NSString *)outlookFolderClass { + return @"IPF.Appointment"; +} + @end /* SOGoAppointmentFolder */ diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m b/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m index 70250582..2a10db18 100644 --- a/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SOGo/SoObjects/Appointments/SOGoAppointmentObject.m @@ -326,4 +326,10 @@ return [self deleteWithBaseSequence:0]; } +/* message type */ + +- (NSString *)outlookMessageClass { + return @"IPM.Appointment"; +} + @end /* SOGoAppointmentObject */ diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version index f8410775..688e0a02 100644 --- a/SOGo/SoObjects/Appointments/Version +++ b/SOGo/SoObjects/Appointments/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=24 +SUBMINOR_VERSION:=25 # v0.9.19 requires NGiCal v4.5.36 # v0.9.13 requires libSOGo v0.9.26 diff --git a/SOGo/SoObjects/Contacts/ChangeLog b/SOGo/SoObjects/Contacts/ChangeLog index 68532de4..3b86b0d9 100644 --- a/SOGo/SoObjects/Contacts/ChangeLog +++ b/SOGo/SoObjects/Contacts/ChangeLog @@ -1,3 +1,8 @@ +2005-02-06 Helge Hess + + * SOGoContactObject.m, SOGoContactFolder.m: added proper + message/folder class (v0.9.6) + 2004-12-08 Marcus Mueller * SOGoContactFolder.m: changed to NGLogging (v0.9.5) diff --git a/SOGo/SoObjects/Contacts/SOGoContactFolder.m b/SOGo/SoObjects/Contacts/SOGoContactFolder.m index ccd1eea7..7c7d6b58 100644 --- a/SOGo/SoObjects/Contacts/SOGoContactFolder.m +++ b/SOGo/SoObjects/Contacts/SOGoContactFolder.m @@ -139,4 +139,10 @@ static BOOL debugOn = YES; return r; } +/* folder type */ + +- (NSString *)outlookFolderClass { + return @"IPF.Contact"; +} + @end /* SOGoContactFolder */ diff --git a/SOGo/SoObjects/Contacts/SOGoContactObject.m b/SOGo/SoObjects/Contacts/SOGoContactObject.m index 0fd3b1f1..cd658032 100644 --- a/SOGo/SoObjects/Contacts/SOGoContactObject.m +++ b/SOGo/SoObjects/Contacts/SOGoContactObject.m @@ -78,4 +78,10 @@ return r; } +/* message type */ + +- (NSString *)outlookMessageClass { + return @"IPM.Contact"; +} + @end /* SOGoContactObject */ diff --git a/SOGo/SoObjects/Contacts/Version b/SOGo/SoObjects/Contacts/Version index 8324e8d4..e120731d 100644 --- a/SOGo/SoObjects/Contacts/Version +++ b/SOGo/SoObjects/Contacts/Version @@ -1,5 +1,5 @@ -# $Id$ +# version file -SUBMINOR_VERSION:=5 +SUBMINOR_VERSION:=6 # v0.9.5 requires NGExtensions v4.5.136 diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog index 312caaf7..2578a09a 100644 --- a/SOGo/SoObjects/Mailer/ChangeLog +++ b/SOGo/SoObjects/Mailer/ChangeLog @@ -1,3 +1,8 @@ +2005-02-06 Helge Hess + + * SOGoMailFolder.m, SOGoDraftsFolder.m: added proper folder classes + (v0.9.66) + 2005-01-31 Helge Hess * v0.9.65 diff --git a/SOGo/SoObjects/Mailer/SOGoDraftsFolder.m b/SOGo/SoObjects/Mailer/SOGoDraftsFolder.m index f6b7f0ef..3d1d9dc6 100644 --- a/SOGo/SoObjects/Mailer/SOGoDraftsFolder.m +++ b/SOGo/SoObjects/Mailer/SOGoDraftsFolder.m @@ -177,4 +177,10 @@ static NSString *spoolFolder = nil; return [self fetchMailNames]; } +/* folder type */ + +- (NSString *)outlookFolderClass { + return @"IPF.Drafts"; +} + @end /* SOGoDraftsFolder */ diff --git a/SOGo/SoObjects/Mailer/SOGoMailFolder.m b/SOGo/SoObjects/Mailer/SOGoMailFolder.m index 7493989d..43a0e61a 100644 --- a/SOGo/SoObjects/Mailer/SOGoMailFolder.m +++ b/SOGo/SoObjects/Mailer/SOGoMailFolder.m @@ -161,6 +161,13 @@ password:[self imap4Password]]; } +/* folder type */ + +- (NSString *)outlookFolderClass { + // TODO: detect Trash/Sent/Drafts folders + return @"IPF.Folder"; +} + /* operations */ - (NSException *)delete { diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version index 9c2c63c6..37ff74e8 100644 --- a/SOGo/SoObjects/Mailer/Version +++ b/SOGo/SoObjects/Mailer/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=65 +SUBMINOR_VERSION:=66 # v0.9.55 requires NGExtensions v4.5.136 # v0.9.44 requires libNGMime v4.3.194 diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 1e299fc4..34cac531 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -1,3 +1,7 @@ +2005-02-06 Helge Hess + + * added -outlookMessageClass / -outlookFolderClass (v0.9.27) + 2004-10-19 Helge Hess * SOGoFolder: added method -fetchContentStringsAndNamesOfAllObjects diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.h b/SOGo/SoObjects/SOGo/SOGoContentObject.h index afa6e6be..fac0382b 100644 --- a/SOGo/SoObjects/SOGo/SOGoContentObject.h +++ b/SOGo/SoObjects/SOGo/SOGoContentObject.h @@ -49,6 +49,10 @@ - (NSException *)saveContentString:(NSString *)_str; - (NSException *)delete; +/* message type */ + +- (NSString *)outlookMessageClass; + @end #endif /* __SOGo_SOGoContentObject_H__ */ diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.m b/SOGo/SoObjects/SOGo/SOGoContentObject.m index ecbc3b2a..09fde609 100644 --- a/SOGo/SoObjects/SOGo/SOGoContentObject.m +++ b/SOGo/SoObjects/SOGo/SOGoContentObject.m @@ -153,6 +153,12 @@ return [self isFolderish]; } +/* message type */ + +- (NSString *)outlookMessageClass { + return nil; +} + /* description */ - (void)appendAttributesToDescription:(NSMutableString *)_ms { diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.h b/SOGo/SoObjects/SOGo/SOGoFolder.h index 09ab714d..71059b6c 100644 --- a/SOGo/SoObjects/SOGo/SOGoFolder.h +++ b/SOGo/SoObjects/SOGo/SOGoFolder.h @@ -54,6 +54,10 @@ - (NSArray *)fetchContentObjectNames; - (NSDictionary *)fetchContentStringsAndNamesOfAllObjects; +/* folder type */ + +- (NSString *)outlookFolderClass; + @end #endif /* __SOGo_SOGoFolder_H__ */ diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.m b/SOGo/SoObjects/SOGo/SOGoFolder.m index a628e577..d3988c66 100644 --- a/SOGo/SoObjects/SOGo/SOGoFolder.m +++ b/SOGo/SoObjects/SOGo/SOGoFolder.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 SKYRIX Software AG + Copyright (C) 2004-2005 SKYRIX Software AG This file is part of OpenGroupware.org. @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include "SOGoFolder.h" #include "common.h" @@ -140,6 +139,12 @@ return [self isFolderish]; } +/* folder type */ + +- (NSString *)outlookFolderClass { + return nil; +} + /* description */ - (void)appendAttributesToDescription:(NSMutableString *)_ms { diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version index caf5c583..ab7e9f78 100644 --- a/SOGo/SoObjects/SOGo/Version +++ b/SOGo/SoObjects/SOGo/Version @@ -1,5 +1,5 @@ -# $Id: Version 170 2004-08-11 10:45:40Z helge $ +# version file -SUBMINOR_VERSION:=26 +SUBMINOR_VERSION:=27 # v0.9.26 requires libOGoContentStore v0.9.13 diff --git a/SOGo/SoObjects/Sieve/ChangeLog b/SOGo/SoObjects/Sieve/ChangeLog index 0684990f..a3bcbced 100644 --- a/SOGo/SoObjects/Sieve/ChangeLog +++ b/SOGo/SoObjects/Sieve/ChangeLog @@ -1,3 +1,8 @@ +2005-02-06 Helge Hess + + * SOGoSieveScriptObject.m, SOGoSieveScriptsFolder.m: assigned + folder/message class (v0.9.7) + 2005-01-30 Helge Hess * SOGoSieveScriptObject.m: implemented Sieve script upload (v0.9.6) diff --git a/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m b/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m index b874a6db..7d7ccdc1 100644 --- a/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m +++ b/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m @@ -128,6 +128,11 @@ return self; } -/* WebDAV */ +/* message type */ + +- (NSString *)outlookMessageClass { + return @"IPM.Filter"; +} + @end /* SOGoSieveScriptObject */ diff --git a/SOGo/SoObjects/Sieve/SOGoSieveScriptsFolder.m b/SOGo/SoObjects/Sieve/SOGoSieveScriptsFolder.m index 37f8c25a..49722fc2 100644 --- a/SOGo/SoObjects/Sieve/SOGoSieveScriptsFolder.m +++ b/SOGo/SoObjects/Sieve/SOGoSieveScriptsFolder.m @@ -89,4 +89,10 @@ return [NSException exceptionWithHTTPStatus:404 /* Not Found */]; } +/* folder type */ + +- (NSString *)outlookFolderClass { + return @"IPF.Filter"; +} + @end /* SOGoSieveScriptsFolder */ diff --git a/SOGo/SoObjects/Sieve/Version b/SOGo/SoObjects/Sieve/Version index 29dc4630..eba6f153 100644 --- a/SOGo/SoObjects/Sieve/Version +++ b/SOGo/SoObjects/Sieve/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=6 +SUBMINOR_VERSION:=7 # v0.9.6 requires libNGMime v4.5.207 # v0.9.1 requires libNGMime v4.3.194 -- 2.39.5