From 00d7179cdb05669f317aa52700d3be3ac47b5617 Mon Sep 17 00:00:00 2001 From: wolfgang Date: Thu, 8 Feb 2007 16:37:00 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1018 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ChangeLog | 16 ++++++++++++++++ Main/sogod.m | 2 +- OGoContentStore/GNUmakefile | 2 +- Protocols/common.make | 2 +- SOPE/NGCards/CardElement.m | 10 ++++++---- SOPE/NGCards/ChangeLog | 6 ++++++ SOPE/NGCards/NSString+NGCards.m | 1 + SOPE/NGCards/iCalRecurrenceRule.m | 2 ++ SOPE/NGCards/iCalTimeZone.m | 3 ++- SOPE/NGCards/iCalTimeZonePeriod.m | 1 + SoObjects/Appointments/SOGoAppointmentFolder.m | 18 +++++++++--------- SoObjects/Appointments/product.plist | 1 + SoObjects/SOGo/GNUmakefile.preamble | 4 +++- SoObjects/SOGo/NSArray+Utilities.h | 6 ++++++ SoObjects/SOGo/NSArray+Utilities.m | 13 +++++++++++++ SoObjects/SOGo/NSString+Utilities.m | 2 ++ SoObjects/common.make | 3 ++- UI/Contacts/English.lproj/Localizable.strings | 2 +- UI/MailerUI/UIxMailMainFrame.m | 3 ++- UI/Scheduler/English.lproj/Localizable.strings | 2 +- UI/Scheduler/French.lproj/Localizable.strings | 2 +- UI/Scheduler/UIxCalInlineAptView.m | 2 ++ UI/Scheduler/UIxCalView.m | 1 + UI/Templates/SchedulerUI/UIxCalMainView.wox | 1 - UI/common.make | 2 +- 25 files changed, 82 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d056c55..2b5cfc95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2007-02-08 Wolfgang Sourdeau + + * SoObjects/SOGo/NSArray+Utilities.m: added an implementation of + makeObjectsPerform:withObject:withObject: for GNUstep + compatibility. + + * OGoContentStore/GNUmakefile, Protocols/common.make, + SoObjects/common.make, UI/common.make: install in + GNUSTEP_INSTALLATION_DIR instead of GNUSTEP_USER_DIR. + +2007-02-07 Ludovic Marcotte + + * UI/Scheduler/English.lproj/Localizable.strings + Fixed typo for "Agendas" + + 2007-02-05 Wolfgang Sourdeau * UI/MailerUI/UIxMailTree.m ([UIxMailTree diff --git a/Main/sogod.m b/Main/sogod.m index ab5c895f..308b2fc0 100644 --- a/Main/sogod.m +++ b/Main/sogod.m @@ -31,7 +31,7 @@ int main(int argc, char **argv, char **env) NSUserDefaults *ud; NSAutoreleasePool *pool; - pool = [[NSAutoreleasePool alloc] init]; + pool = [NSAutoreleasePool new]; #if LIB_FOUNDATION_LIBRARY [NSProcessInfo initializeWithArguments:argv count:argc environment:env]; #endif diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile index 5807b690..d8a20b4f 100644 --- a/OGoContentStore/GNUmakefile +++ b/OGoContentStore/GNUmakefile @@ -7,7 +7,7 @@ include ./Version LIBRARY_NAME = libOGoContentStore TOOL_NAME = test_quick_extract -TYPEMODELS_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/OCSTypeModels/ +TYPEMODELS_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/OCSTypeModels/ libOGoContentStore_HEADER_FILES_DIR = . libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore diff --git a/Protocols/common.make b/Protocols/common.make index 8d43914d..03483a6d 100644 --- a/Protocols/common.make +++ b/Protocols/common.make @@ -6,7 +6,7 @@ include ../../Version include ./Version BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) ADDITIONAL_INCLUDE_DIRS += \ -I.. \ diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m index 4e85a8e4..cf4c489a 100644 --- a/SOPE/NGCards/CardElement.m +++ b/SOPE/NGCards/CardElement.m @@ -22,6 +22,7 @@ #import #import +#import #import #import "NSArray+NGCards.h" @@ -300,7 +301,8 @@ - (NSString *) namedValue: (NSString *) aValueName { - unsigned int index, equalSign; + unsigned int index; + NSRange equalSign; NSString *value; index = [self _namedValue: aValueName]; @@ -309,9 +311,9 @@ else { value = [values objectAtIndex: index]; - equalSign = [value indexOfString: @"="]; - if (equalSign != NSNotFound) - value = [value substringFromIndex: equalSign + 1]; + equalSign = [value rangeOfString: @"="]; + if (equalSign.location != NSNotFound) + value = [value substringFromIndex: equalSign.location + 1]; } return value; diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index 2d156fe2..5dc47b5e 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,9 @@ +2007-02-08 Wolfgang Sourdeau + + * CardElement.m ([CardElement -namedValue:aValueName]): use + NSString's rangeOfString instead of indexOfString for + compatibility with GNUstep. + 2007-02-02 Wolfgang Sourdeau * NGVCard.m ([NGVCard -classForTag:classTag]): declare an entry diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m index 768009d2..eb0c4e42 100644 --- a/SOPE/NGCards/NSString+NGCards.m +++ b/SOPE/NGCards/NSString+NGCards.m @@ -21,6 +21,7 @@ */ #import +#import #import #import #import diff --git a/SOPE/NGCards/iCalRecurrenceRule.m b/SOPE/NGCards/iCalRecurrenceRule.m index 4292d37b..9842dd45 100644 --- a/SOPE/NGCards/iCalRecurrenceRule.m +++ b/SOPE/NGCards/iCalRecurrenceRule.m @@ -19,6 +19,8 @@ 02111-1307, USA. */ +#import +#import #import #import #import diff --git a/SOPE/NGCards/iCalTimeZone.m b/SOPE/NGCards/iCalTimeZone.m index 51bd3729..1de139fb 100644 --- a/SOPE/NGCards/iCalTimeZone.m +++ b/SOPE/NGCards/iCalTimeZone.m @@ -21,8 +21,9 @@ */ #import -#import #import +#import +#import #import "NSCalendarDate+NGCards.h" #import "NSString+NGCards.h" diff --git a/SOPE/NGCards/iCalTimeZonePeriod.m b/SOPE/NGCards/iCalTimeZonePeriod.m index 03d6cb4b..d157720b 100644 --- a/SOPE/NGCards/iCalTimeZonePeriod.m +++ b/SOPE/NGCards/iCalTimeZonePeriod.m @@ -22,6 +22,7 @@ #import #import +#import #import "iCalDateTime.h" #import "iCalRecurrenceRule.h" diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 9cbda182..a85e2900 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -70,15 +70,15 @@ static NSNumber *sharedYes = nil; lm = [NGLoggerManager defaultLoggerManager]; logger = [lm loggerForDefaultKey:@"SOGoAppointmentFolderDebugEnabled"]; - securityInfo = [self soClassSecurityInfo]; - [securityInfo declareRole: SOGoRole_Delegate - asDefaultForPermission: SoPerm_AddDocumentsImagesAndFiles]; - [securityInfo declareRole: SOGoRole_Delegate - asDefaultForPermission: SoPerm_ChangeImagesAndFiles]; - [securityInfo declareRoles: [NSArray arrayWithObjects: - SOGoRole_Delegate, - SOGoRole_Assistant, nil] - asDefaultForPermission: SoPerm_View]; +// securityInfo = [self soClassSecurityInfo]; +// [securityInfo declareRole: SOGoRole_Delegate +// asDefaultForPermission: SoPerm_AddDocumentsImagesAndFiles]; +// [securityInfo declareRole: SOGoRole_Delegate +// asDefaultForPermission: SoPerm_ChangeImagesAndFiles]; +// [securityInfo declareRoles: [NSArray arrayWithObjects: +// SOGoRole_Delegate, +// SOGoRole_Assistant, nil] +// asDefaultForPermission: SoPerm_View]; sharedYes = [[NSNumber numberWithBool:YES] retain]; } diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist index 8e22aec1..e9856d90 100644 --- a/SoObjects/Appointments/product.plist +++ b/SoObjects/Appointments/product.plist @@ -11,6 +11,7 @@ SOGoAppointmentFolder = { superclass = "SOGoFolder"; defaultRoles = { + "View" = ( "Owner", "Delegate", "Assistant" ); "FreeBusyLookup" = ( "Owner", "Delegate", "Assistant", "FreeBusy" ); }; }; diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble index fd20c995..0a7155d9 100644 --- a/SoObjects/SOGo/GNUmakefile.preamble +++ b/SoObjects/SOGo/GNUmakefile.preamble @@ -13,7 +13,7 @@ endif SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib libSOGo_LIB_DIRS += \ - -L$(RELBUILD_DIR_libOGoContentStore) + -L$(RELBUILD_DIR_libOGoContentStore) -L$(RELBUILD_DIR_libOGoContentStore)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR) libSOGo_LIBRARIES_DEPEND_UPON += \ -lOGoContentStore \ @@ -26,6 +26,8 @@ libSOGo_LIBRARIES_DEPEND_UPON += \ -lNGLdap ADDITIONAL_TOOL_LIBS += \ + -L$(GNUSTEP_OBJ_DIR)/ \ + $(libSOGO_LIB_DIRS) \ -lGDLContentStore -lGDLAccess \ -lNGLdap \ -lNGExtensions -lEOControl \ diff --git a/SoObjects/SOGo/NSArray+Utilities.h b/SoObjects/SOGo/NSArray+Utilities.h index bd026f4c..15cbb174 100644 --- a/SoObjects/SOGo/NSArray+Utilities.h +++ b/SoObjects/SOGo/NSArray+Utilities.h @@ -31,6 +31,12 @@ - (NSArray *) stringsWithFormat: (NSString *) format; +#ifdef GNUSTEP_BASE_LIBRARY +- (void) makeObjectsPerform: (SEL) selector + withObject: (id) object1 + withObject: (id) object2; +#endif + @end #endif /* NSARRAY_UTILITIES_H */ diff --git a/SoObjects/SOGo/NSArray+Utilities.m b/SoObjects/SOGo/NSArray+Utilities.m index 6949db3b..ed30b5e5 100644 --- a/SoObjects/SOGo/NSArray+Utilities.m +++ b/SoObjects/SOGo/NSArray+Utilities.m @@ -45,4 +45,17 @@ return formattedStrings; } +- (void) makeObjectsPerform: (SEL) selector + withObject: (id) object1 + withObject: (id) object2 +{ + int count, max; + + max = [self count]; + for (count = 0; count < max; count++) + [[self objectAtIndex: count] performSelector: selector + withObject: object1 + withObject: object2]; +} + @end diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m index 03609d0c..77c4e458 100644 --- a/SoObjects/SOGo/NSString+Utilities.m +++ b/SoObjects/SOGo/NSString+Utilities.m @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#import + #import "NSString+Utilities.h" #import "NSDictionary+URL.h" diff --git a/SoObjects/common.make b/SoObjects/common.make index fbedc517..064352a9 100644 --- a/SoObjects/common.make +++ b/SoObjects/common.make @@ -6,7 +6,7 @@ include ../../Version include ./Version BUNDLE_EXTENSION = .SOGo -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION) WOBUNDLE_EXTENSION = $(BUNDLE_EXTENSION) WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR) @@ -20,6 +20,7 @@ ADDITIONAL_LIB_DIRS += \ -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \ -L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \ -L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \ + -L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \ -L/usr/local/lib BUNDLE_LIBS += \ diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 8f237d56..95e560d9 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Preferred" = "Preferred"; "Card for %@" = "Card for %@"; "Display Name: " = "Display Name: "; -"Email Address: " = "Email Address: " +"Email Address: " = "Email Address: "; "Firstname: " = "Firstname: "; "Lastname: " = "Lastname: "; diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index c9063d6e..a90cdf1b 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -19,7 +19,8 @@ 02111-1307, USA. */ -#import +#import +#import #import #import "UIxMailMainFrame.h" diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index b0a25c0f..d9170d8a 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -66,7 +66,7 @@ /* Menu */ -"Calendars" = "Agendas"; +"Calendars" = "Calendars"; "Calendar" = "Calendar"; "Contacts" = "Contacts"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 6f24256c..6c797a61 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -27,7 +27,7 @@ "Week" = "Semaine"; "this week" = "cette semaine"; -"Week %d" = "Semaine nº %d"; +"Week %d" = "Semaine nú %d"; /* Month */ diff --git a/UI/Scheduler/UIxCalInlineAptView.m b/UI/Scheduler/UIxCalInlineAptView.m index f6d2ae33..1f46861c 100644 --- a/UI/Scheduler/UIxCalInlineAptView.m +++ b/UI/Scheduler/UIxCalInlineAptView.m @@ -20,6 +20,8 @@ */ // $Id$ +#import + #import #import diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m index 48fda46f..ea5fedf0 100644 --- a/UI/Scheduler/UIxCalView.m +++ b/UI/Scheduler/UIxCalView.m @@ -12,6 +12,7 @@ #import "UIxComponent+Agenor.h" #import "SoObjects/Appointments/SOGoAppointmentFolder.h" +#import #import #import diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 9a904ec0..c6357450 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -6,7 +6,6 @@ xmlns:label="OGo:label" className="UIxPageFrame" title="title" - popup="isPopup" >