From c83fc0d8e94cd065048caae514f4c78cff9a52e5 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 15 Aug 2007 20:09:51 +0000 Subject: [PATCH] Monotone-Parent: 668c4f876568e36b66e3c665c37e3108a08fb967 Monotone-Revision: 5a752c9870d0f15bdeafe1c5657bcad3f21ef35a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-08-15T20:09:51 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 + SoObjects/Mailer/SOGoMailIdentity.h | 111 --------------------- SoObjects/Mailer/SOGoMailIdentity.m | 143 ---------------------------- 3 files changed, 3 insertions(+), 254 deletions(-) delete mode 100644 SoObjects/Mailer/SOGoMailIdentity.h delete mode 100644 SoObjects/Mailer/SOGoMailIdentity.m diff --git a/ChangeLog b/ChangeLog index 3d9c39cbf..457a6b557 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-08-15 Wolfgang Sourdeau + * SoObjects/Mailer/SOGoMailIdentity.[hm]: removed useless class + module. + * SoObjects/SOGo/NSArray+Utilities.m ([NSArray -keysWithFormat:format]): method that forward the method of the same name to each member of the array, considering they all are diff --git a/SoObjects/Mailer/SOGoMailIdentity.h b/SoObjects/Mailer/SOGoMailIdentity.h deleted file mode 100644 index c340fdee2..000000000 --- a/SoObjects/Mailer/SOGoMailIdentity.h +++ /dev/null @@ -1,111 +0,0 @@ -/* - 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_SOGoMailIdentity_H__ -#define __Mailer_SOGoMailIdentity_H__ - -#import - -/* - SOGoMailIdentity - - A user identity bound to an account. - - Note: currently this is not a SoObject. This might change later on. - - - In Thunderbird you have a set of accounts which in turn have a set of - identities. There is one default identity. - - The identities then have: - - settings - - a name - - a from-email - - a reply-to - - an organization - - a signature - - a vcard (to be attached) - - folder settings - - Sent-Folder and bcc - - Drafts + Templates - - composition - - whether to use HTML - - whether to quote the source message (reply below, above the quote or - select the quote) -*/ - -@class NSString; - -@interface SOGoMailIdentity : NSObject -{ - NSString *name; - NSString *email; - NSString *replyTo; - NSString *organization; - NSString *signature; - NSString *vCard; - NSString *sentFolderName; - NSString *sentBCC; - NSString *draftsFolderName; - NSString *templatesFolderName; - struct { - int composeHTML:1; - int reserved:31; - } idFlags; -} - -/* accessors */ - -- (void)setName:(NSString *)_value; -- (NSString *)name; - -- (void)setEmail:(NSString *)_value; -- (NSString *)email; - -- (void)setReplyTo:(NSString *)_value; -- (NSString *)replyTo; - -- (void)setOrganization:(NSString *)_value; -- (NSString *)organization; - -- (void)setSignature:(NSString *)_value; -- (NSString *)signature; -- (BOOL)hasSignature; - -- (void)setVCard:(NSString *)_value; -- (NSString *)vCard; -- (BOOL)hasVCard; - -- (void)setSentFolderName:(NSString *)_value; -- (NSString *)sentFolderName; - -- (void)setSentBCC:(NSString *)_value; -- (NSString *)sentBCC; - -- (void)setDraftsFolderName:(NSString *)_value; -- (NSString *)draftsFolderName; - -- (void)setTemplatesFolderName:(NSString *)_value; -- (NSString *)templatesFolderName; - -@end - -#endif /* __Mailer_SOGoMailIdentity_H__ */ diff --git a/SoObjects/Mailer/SOGoMailIdentity.m b/SoObjects/Mailer/SOGoMailIdentity.m deleted file mode 100644 index 424d08918..000000000 --- a/SoObjects/Mailer/SOGoMailIdentity.m +++ /dev/null @@ -1,143 +0,0 @@ -/* - 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. -*/ - -#import - -#import - -#import "SOGoMailIdentity.h" - -@implementation SOGoMailIdentity - -- (void)dealloc { - [name release]; - [email release]; - [replyTo release]; - [organization release]; - [signature release]; - [vCard release]; - [sentFolderName release]; - [sentBCC release]; - [draftsFolderName release]; - [templatesFolderName release]; - [super dealloc]; -} - -/* accessors */ - -- (void)setName:(NSString *)_value { - ASSIGNCOPY(name, _value); -} -- (NSString *)name { - return name; -} - -- (void)setEmail:(NSString *)_value { - ASSIGNCOPY(email, _value); -} -- (NSString *)email { - return email; -} - -- (void)setReplyTo:(NSString *)_value { - ASSIGNCOPY(replyTo, _value); -} -- (NSString *)replyTo { - return replyTo; -} - -- (void)setOrganization:(NSString *)_value { - ASSIGNCOPY(organization, _value); -} -- (NSString *)organization { - return organization; -} - -- (void)setSignature:(NSString *)_value { - ASSIGNCOPY(signature, _value); -} -- (NSString *)signature { - return signature; -} -- (BOOL)hasSignature { - return [[self signature] isNotEmpty]; -} - -- (void)setVCard:(NSString *)_value { - ASSIGNCOPY(vCard, _value); -} -- (NSString *)vCard { - return vCard; -} -- (BOOL)hasVCard { - return [[self vCard] isNotEmpty]; -} - -- (void)setSentFolderName:(NSString *)_value { - ASSIGNCOPY(sentFolderName, _value); -} -- (NSString *)sentFolderName { - return sentFolderName; -} - -- (void)setSentBCC:(NSString *)_value { - ASSIGNCOPY(sentBCC, _value); -} -- (NSString *)sentBCC { - return sentBCC; -} - -- (void)setDraftsFolderName:(NSString *)_value { - ASSIGNCOPY(draftsFolderName, _value); -} -- (NSString *)draftsFolderName { - return draftsFolderName; -} - -- (void)setTemplatesFolderName:(NSString *)_value { - ASSIGNCOPY(templatesFolderName, _value); -} -- (NSString *)templatesFolderName { - return templatesFolderName; -} - -/* description */ - -- (NSString *)description { - NSMutableString *ms; - - ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; - - if (name != nil) [ms appendFormat:@" name='%@'", name]; - if (email != nil) [ms appendFormat:@" email='%@'", email]; - - if (sentFolderName != nil) - [ms appendFormat:@" sent='%@'", sentFolderName]; - - if ([sentBCC length] > 0) [ms appendString:@" sent-bcc"]; - if ([vCard length] > 0) [ms appendString:@" vcard"]; - - [ms appendString:@">"]; - return ms; -} - -@end /* SOGoMailIdentity */