From caeaf9861ad740af262497d5b5125cab1d44bd28 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 19 Oct 2004 22:14:07 +0000 Subject: [PATCH] moved some code to NGiCal git-svn-id: http://svn.opengroupware.org/SOGo/trunk@412 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGoLogic/ChangeLog | 4 ++ SOGoLogic/GNUmakefile | 3 +- SOGoLogic/NSString+iCal.h | 11 +--- SOGoLogic/NSString+iCal.m | 130 -------------------------------------- SOGoLogic/Version | 5 +- 5 files changed, 10 insertions(+), 143 deletions(-) delete mode 100644 SOGoLogic/NSString+iCal.m diff --git a/SOGoLogic/ChangeLog b/SOGoLogic/ChangeLog index 7d9cc6eb..b34384bd 100644 --- a/SOGoLogic/ChangeLog +++ b/SOGoLogic/ChangeLog @@ -1,3 +1,7 @@ +2004-10-20 Helge Hess + + * moved NSString+iCal methods to NGiCal (v0.9.23) + 2004-10-19 Marcus Mueller * AgenorUserManager.[hm]: added an interface to retrieve the IMAP diff --git a/SOGoLogic/GNUmakefile b/SOGoLogic/GNUmakefile index 70483fc6..76c923d5 100644 --- a/SOGoLogic/GNUmakefile +++ b/SOGoLogic/GNUmakefile @@ -1,4 +1,4 @@ -# $Id$ +# GNUstep Makefile include $(GNUSTEP_MAKEFILES)/common.make include ./Version @@ -19,7 +19,6 @@ libSOGoLogic_OBJC_FILES += \ SOGoAppointment.m \ SOGoAppointmentICalRenderer.m \ AgenorUserManager.m \ - NSString+iCal.m -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/library.make diff --git a/SOGoLogic/NSString+iCal.h b/SOGoLogic/NSString+iCal.h index 2d7cfdca..f8d29ccf 100644 --- a/SOGoLogic/NSString+iCal.h +++ b/SOGoLogic/NSString+iCal.h @@ -24,16 +24,9 @@ #ifndef __NSString_iCal_H_ #define __NSString_iCal_H_ +// DEPRECATED #import - - -@interface NSString (SOGoiCal) - -- (NSString *)iCalDQUOTESafeString; -- (NSString *)iCalSafeString; -- (NSString *)iCalEscapedStringWithEscapeSet:(NSCharacterSet *)_es; - -@end +#include #endif /* __NSString_iCal_H_ */ diff --git a/SOGoLogic/NSString+iCal.m b/SOGoLogic/NSString+iCal.m deleted file mode 100644 index 898d2e58..00000000 --- a/SOGoLogic/NSString+iCal.m +++ /dev/null @@ -1,130 +0,0 @@ -/* - Copyright (C) 2000-2004 SKYRIX Software AG - - This file is part of OGo - - 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. -*/ -// $Id$ - - -#import "NSString+iCal.h" - - -@interface NSString (SOGoiCal_Private) -- (NSString *)iCalCleanString; -@end - -#include "common.h" - -@interface SOGoICalStringEscaper : NSObject -{ -} -+ (id)sharedEscaper; -@end - -@implementation SOGoICalStringEscaper -+ (id)sharedEscaper { - static id sharedInstance = nil; - if(!sharedInstance) { - sharedInstance = [[self alloc] init]; - } - return sharedInstance; -} - -- (NSString *)stringByEscapingString:(NSString *)_s { - unichar c; - - if(!_s || [_s length] == 0) - return nil; - - c = [_s characterAtIndex:0]; - if(c == '\n') { - return @"\\n"; - } - else if(c == '\r') { - return nil; /* effectively remove char */ - } - return [NSString stringWithFormat:@"\\%@", _s]; -} - -@end - -@implementation NSString (SOGoiCal) - -#if 0 -- (NSString *)iCalFoldedString { - /* RFC2445, 4.1 Content Lines - - The iCalendar object is organized into individual lines of text, - called content lines. Content lines are delimited by a line break, - which is a CRLF sequence (US-ASCII decimal 13, followed by US-ASCII - decimal 10). - Lines of text SHOULD NOT be longer than 75 octets, excluding the line - break. Long content lines SHOULD be split into a multiple line - representations using a line "folding" technique. That is, a long - line can be split between any two characters by inserting a CRLF - immediately followed by a single linear white space character (i.e., - SPACE, US-ASCII decimal 32 or HTAB, US-ASCII decimal 9). - Any sequence of CRLF followed immediately by a single linear white space - character is ignored (i.e., removed) when processing the content type. - */ -} -#endif - -/* strip off any characters from string which are not allowed in iCal */ -- (NSString *)iCalCleanString { - static NSCharacterSet *replaceSet = nil; - - if(replaceSet == nil) { - replaceSet = [NSCharacterSet characterSetWithCharactersInString:@"\r"]; - [replaceSet retain]; - } - - return [self stringByEscapingCharactersFromSet:replaceSet - usingStringEscaping:[SOGoICalStringEscaper sharedEscaper]]; -} - -- (NSString *)iCalDQUOTESafeString { - static NSCharacterSet *escapeSet = nil; - - if(escapeSet == nil) { - escapeSet = [NSCharacterSet characterSetWithCharactersInString:@"\\\""]; - [escapeSet retain]; - } - return [self iCalEscapedStringWithEscapeSet:escapeSet]; -} - -- (NSString *)iCalSafeString { - static NSCharacterSet *escapeSet = nil; - - if(escapeSet == nil) { - escapeSet = [NSCharacterSet characterSetWithCharactersInString:@"\n,;\\\""]; - [escapeSet retain]; - } - return [self iCalEscapedStringWithEscapeSet:escapeSet]; -} - -/* Escape unsafe characters */ -- (NSString *)iCalEscapedStringWithEscapeSet:(NSCharacterSet *)_es { - NSString *s; - - s = [self iCalCleanString]; - return [s stringByEscapingCharactersFromSet:_es - usingStringEscaping:[SOGoICalStringEscaper sharedEscaper]]; -} - -@end diff --git a/SOGoLogic/Version b/SOGoLogic/Version index 79ebcd59..b2808140 100644 --- a/SOGoLogic/Version +++ b/SOGoLogic/Version @@ -1,6 +1,7 @@ -# $Id$ +# Version file -SUBMINOR_VERSION:=22 +SUBMINOR_VERSION:=23 +# v0.9.23 requires NGiCal v4.3.32 # v0.9.18 requires NGExtensions v4.3.123 # v0.9.13 requires libFoundation v1.0.62 -- 2.39.5