From 7f86d1b17a44414ea737d4ef787cdd888d1045ec Mon Sep 17 00:00:00 2001 From: znek Date: Thu, 3 Mar 2005 21:07:31 +0000 Subject: [PATCH] fixed minor annoyances git-svn-id: http://svn.opengroupware.org/SOGo/trunk@624 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SOGo.xcode/project.pbxproj | 1 + SOGo/SoObjects/SOGo/ChangeLog | 4 +++ SOGo/SoObjects/SOGo/SOGoGroupFolder.m | 32 +++++++++++++++++++----- SOGo/SoObjects/SOGo/Version | 2 +- SOGo/UI/ChangeLog | 4 +++ SOGo/UI/Scheduler/ChangeLog | 2 ++ SOGo/UI/Scheduler/UIxCalWeekListview.m | 1 + SOGo/UI/Scheduler/Version | 2 +- SOGo/UI/Templates/UIxCalWeekOverview.wox | 8 +++--- 9 files changed, 45 insertions(+), 11 deletions(-) diff --git a/SOGo/SOGo.xcode/project.pbxproj b/SOGo/SOGo.xcode/project.pbxproj index d9cfcb16..1ced8a06 100644 --- a/SOGo/SOGo.xcode/project.pbxproj +++ b/SOGo/SOGo.xcode/project.pbxproj @@ -1505,6 +1505,7 @@ }; AD85C73107C4E8740036AC7A = { fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SOGoGroupFolder.m; diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 62da83cd..5af97f2b 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -1,3 +1,7 @@ +2005-03-03 Marcus Mueller + + * SOGoGroupFolder.m: switched logging to NGLogging (v0.9.33) + 2005-03-02 Marcus Mueller * NSObject+AptComparison.[hm]: new comparison method. This is used diff --git a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m index b85a9306..c3bce605 100644 --- a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m +++ b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m @@ -25,16 +25,35 @@ @implementation SOGoGroupFolder +static NGLogger *logger = nil; + ++ (void)initialize { + NGLoggerManager *lm; + static BOOL didInit = NO; + + if (didInit) return; + didInit = YES; + + lm = [NGLoggerManager defaultLoggerManager]; + logger = [lm loggerForDefaultKey:@"SOGoGroupFolderDebugEnabled"]; +} + - (void)dealloc { [self->uidToFolder release]; [self->folders release]; [super dealloc]; } +/* logging */ + +- (NGLogger *)debugLogger { + return logger; +} + /* accessors */ - (NSArray *)uids { - [self logWithFormat:@"ERROR: instantiated abstract Group folder class!"]; + [self errorWithFormat:@"instantiated abstract Group folder class!"]; return nil; } @@ -48,7 +67,7 @@ /* create subcontext, so that we don't destroy our environment */ if ((ctx = [_ctx createSubContext]) == nil) { - [self logWithFormat:@"ERROR: could not create SOPE subcontext!"]; + [self errorWithFormat:@"could not create SOPE subcontext!"]; return nil; } @@ -61,13 +80,14 @@ result = [[ctx application] traversePathArray:path inContext:ctx error:&error acquire:NO]; if (error != nil) { - [self logWithFormat:@"ERROR: folder lookup failed (uid=%@): %@", + [self errorWithFormat:@"folder lookup failed (uid=%@): %@", _uid, error]; return nil; } - [self debugWithFormat:@"Note: got folder for uid %@ path %@: %@", - _uid, [path componentsJoinedByString:@"=>"], result]; + if (logger) + [self debugWithFormat:@"Note: got folder for uid %@ path %@: %@", + _uid, [path componentsJoinedByString:@"=>"], result]; return result; } @@ -155,7 +175,7 @@ if (calClass == Nil) calClass = NSClassFromString(@"SOGoGroupAppointmentFolder"); if (calClass == Nil) { - [self logWithFormat:@"ERROR: missing SOGoGroupAppointmentFolder class!"]; + [self errorWithFormat:@"missing SOGoGroupAppointmentFolder class!"]; return nil; } diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version index 2d0e88fb..b36c56a5 100644 --- a/SOGo/SoObjects/SOGo/Version +++ b/SOGo/SoObjects/SOGo/Version @@ -1,5 +1,5 @@ # version file -SUBMINOR_VERSION:=32 +SUBMINOR_VERSION:=33 # v0.9.26 requires libOGoContentStore v0.9.13 diff --git a/SOGo/UI/ChangeLog b/SOGo/UI/ChangeLog index f2c6a0fa..de71fa9d 100644 --- a/SOGo/UI/ChangeLog +++ b/SOGo/UI/ChangeLog @@ -1,3 +1,7 @@ +2005-03-03 Marcus Mueller + + * UIxCalWeekOverview.wox: some pretty printing + 2005-02-17 Marcus Mueller * common.make: removed dependency to removed libSOGoLogic diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index cf548f33..b29b3fbe 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,5 +1,7 @@ 2005-03-03 Marcus Mueller + * UIxCalWeekListview.m: fixed compile warnings (v0.9.120) + * UIxCalWeekListview.m: view needs to fetch coreInfos instead of just overviews because it needs information stored in "partmails". Fixes SOGo Bug #1248. (v0.9.119) diff --git a/SOGo/UI/Scheduler/UIxCalWeekListview.m b/SOGo/UI/Scheduler/UIxCalWeekListview.m index d77321f1..fcf4d689 100644 --- a/SOGo/UI/Scheduler/UIxCalWeekListview.m +++ b/SOGo/UI/Scheduler/UIxCalWeekListview.m @@ -37,6 +37,7 @@ #include #include #include +#include "SoObjects/Appointments/SOGoAppointmentFolder.h" @implementation UIxCalWeekListview diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index add46b1e..6de1c872 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=119 +SUBMINOR_VERSION:=120 # v0.9.115 requires NGiCal v4.5.44 # v0.9.113 requires libSOGo v0.9.30 diff --git a/SOGo/UI/Templates/UIxCalWeekOverview.wox b/SOGo/UI/Templates/UIxCalWeekOverview.wox index 5a290f7c..486a717f 100644 --- a/SOGo/UI/Templates/UIxCalWeekOverview.wox +++ b/SOGo/UI/Templates/UIxCalWeekOverview.wox @@ -182,9 +182,11 @@ - + -- 2.39.5