From 5577f520d687ca1750fee8a7e1b2266e818f37f2 Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 14 Jul 2005 23:57:37 +0000 Subject: [PATCH] fixed gcc 4.0 warnings git-svn-id: http://svn.opengroupware.org/SOGo/trunk@765 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/Appointments/ChangeLog | 4 ++++ .../Appointments/SOGoAppointmentFolder.m | 4 ++-- SOGo/SoObjects/Appointments/Version | 2 +- SOGo/SoObjects/Mailer/ChangeLog | 4 ++++ SOGo/SoObjects/Mailer/SOGoMailManager.h | 3 ++- SOGo/SoObjects/Mailer/SOGoMailObject.m | 8 +++++--- SOGo/SoObjects/Mailer/Version | 2 +- SOGo/SoObjects/SOGo/ChangeLog | 6 ++++++ SOGo/SoObjects/SOGo/GNUmakefile.preamble | 5 +++-- SOGo/SoObjects/SOGo/SOGoGroupFolder.m | 2 +- SOGo/SoObjects/SOGo/SOGoUser.m | 16 +++++++++------- SOGo/SoObjects/SOGo/Version | 2 +- SOGo/SoObjects/common.make | 5 +++-- 13 files changed, 42 insertions(+), 21 deletions(-) diff --git a/SOGo/SoObjects/Appointments/ChangeLog b/SOGo/SoObjects/Appointments/ChangeLog index e73587c4..d53348ff 100644 --- a/SOGo/SoObjects/Appointments/ChangeLog +++ b/SOGo/SoObjects/Appointments/ChangeLog @@ -1,3 +1,7 @@ +2005-07-15 Helge Hess + + * SOGoAppointmentFolder.m: fixed gcc 4.0 warnings (v0.9.45) + 2005-07-14 Marcus Mueller * v0.9.44 diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m index 5e56bb75..f01598a3 100644 --- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -68,7 +68,7 @@ static NSTimeZone *MET = nil; /* logging */ -- (NGLogger *)debugLogger { +- (id)debugLogger { return logger; } @@ -688,7 +688,7 @@ static NSTimeZone *MET = nil; /* GET */ -- (id)GETAction:(WOContext *)_ctx { +- (id)GETAction:(id)_ctx { // TODO: I guess this should really be done by SOPE (redirect to // default method) WOResponse *r; diff --git a/SOGo/SoObjects/Appointments/Version b/SOGo/SoObjects/Appointments/Version index fed6879e..213f7688 100644 --- a/SOGo/SoObjects/Appointments/Version +++ b/SOGo/SoObjects/Appointments/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=44 +SUBMINOR_VERSION:=45 # v0.9.42 requires libSOGo v0.9.54 # v0.9.32 requires libGDLContentStore v4.5.26 diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog index 336cab43..d2f0236f 100644 --- a/SOGo/SoObjects/Mailer/ChangeLog +++ b/SOGo/SoObjects/Mailer/ChangeLog @@ -1,3 +1,7 @@ +2005-07-15 Helge Hess + + * SOGoMailManager.h: fixed a gcc 4.0 warning (v0.9.103) + 2005-07-14 Helge Hess * v0.9.102 diff --git a/SOGo/SoObjects/Mailer/SOGoMailManager.h b/SOGo/SoObjects/Mailer/SOGoMailManager.h index fb357502..0e900e4a 100644 --- a/SOGo/SoObjects/Mailer/SOGoMailManager.h +++ b/SOGo/SoObjects/Mailer/SOGoMailManager.h @@ -33,6 +33,7 @@ */ @class NSString, NSData, NSURL, NSArray, NSMutableDictionary, NSTimer; +@class NSDictionary; @class NSException; @class NGImap4Client; @@ -81,7 +82,7 @@ - (NSException *)moveMailboxAtURL:(NSURL *)_srcurl toURL:(NSURL *)_desturl password:(NSString *)_pwd; -- (id)aclForMailboxAtURL:(NSURL *)_url password:(NSString *)_pwd; +- (NSDictionary *)aclForMailboxAtURL:(NSURL *)_url password:(NSString *)_pwd; - (NSString *)myRightsForMailboxAtURL:(NSURL *)_url password:(NSString *)_pwd; - (NSException *)addFlags:(id)_f toAllMessagesInURL:(NSURL *)_u diff --git a/SOGo/SoObjects/Mailer/SOGoMailObject.m b/SOGo/SoObjects/Mailer/SOGoMailObject.m index ec9d5c58..443bd7ca 100644 --- a/SOGo/SoObjects/Mailer/SOGoMailObject.m +++ b/SOGo/SoObjects/Mailer/SOGoMailObject.m @@ -363,7 +363,7 @@ static BOOL debugBodyStructure = NO; /* recurse */ - parts = [_info objectForKey:@"parts"]; + parts = [(NSDictionary *)_info objectForKey:@"parts"]; for (i = 0, count = [parts count]; i < count; i++) { NSString *sp; id childInfo; @@ -380,7 +380,7 @@ static BOOL debugBodyStructure = NO; /* check body */ - if ((body = [_info objectForKey:@"body"]) != nil) { + if ((body = [(NSDictionary *)_info objectForKey:@"body"]) != nil) { NSString *sp; sp = [[body valueForKey:@"type"] lowercaseString]; @@ -411,7 +411,9 @@ static BOOL debugBodyStructure = NO; result = [self fetchParts:_fetchKeys]; result = [result valueForKey:@"RawResponse"]; // hackish - result = [result objectForKey:@"fetch"]; // Note: -valueForKey: doesn't work! + + // Note: -valueForKey: doesn't work! + result = [(NSDictionary *)result objectForKey:@"fetch"]; count = [_fetchKeys count]; flatContents = [NSMutableDictionary dictionaryWithCapacity:count]; diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version index d33008ba..33dce1ed 100644 --- a/SOGo/SoObjects/Mailer/Version +++ b/SOGo/SoObjects/Mailer/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=102 +SUBMINOR_VERSION:=103 # v0.9.96 requires libNGMime v4.5.223 # v0.9.91 requires libNGMime v4.5.222 diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 02f51e0f..7bd4ecad 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -1,5 +1,11 @@ 2005-07-15 Helge Hess + * v0.9.62 + + * SOGoGroupFolder.m, SOGoUser.m: fixed a gcc 4.0 warning + + * GNUmakefile.preamble: properly use SYSTEM_LIB_DIR + * v0.9.61 * SOGoContentObject.m: fixed a Cocoa warning diff --git a/SOGo/SoObjects/SOGo/GNUmakefile.preamble b/SOGo/SoObjects/SOGo/GNUmakefile.preamble index 2aaad264..a4a27319 100644 --- a/SOGo/SoObjects/SOGo/GNUmakefile.preamble +++ b/SOGo/SoObjects/SOGo/GNUmakefile.preamble @@ -10,9 +10,10 @@ else ../../OGoContentStore/$(GNUSTEP_OBJ_DIR) endif +SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib + libSOGo_LIB_DIRS += \ - -L$(RELBUILD_DIR_libOGoContentStore) \ - -L/usr/local/lib -L/usr/lib + -L$(RELBUILD_DIR_libOGoContentStore) libSOGo_LIBRARIES_DEPEND_UPON += \ -lOGoContentStore \ diff --git a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m index c3bce605..189f0781 100644 --- a/SOGo/SoObjects/SOGo/SOGoGroupFolder.m +++ b/SOGo/SoObjects/SOGo/SOGoGroupFolder.m @@ -46,7 +46,7 @@ static NGLogger *logger = nil; /* logging */ -- (NGLogger *)debugLogger { +- (id)debugLogger { return logger; } diff --git a/SOGo/SoObjects/SOGo/SOGoUser.m b/SOGo/SoObjects/SOGo/SOGoUser.m index 71230bd3..d04d860b 100644 --- a/SOGo/SoObjects/SOGo/SOGoUser.m +++ b/SOGo/SoObjects/SOGo/SOGoUser.m @@ -92,7 +92,8 @@ // TODO: maybe we should add an [activeUser reset] method to SOPE id folder; - if ((folder = [_ctx objectForKey:@"ActiveUserHomeFolder"]) != nil) + folder = [(WOContext *)_ctx objectForKey:@"ActiveUserHomeFolder"]; + if (folder != nil) return [folder isNotNull] ? folder : nil; folder = [[WOApplication application] lookupName:[self login] @@ -100,16 +101,17 @@ if ([folder isKindOfClass:[NSException class]]) return folder; - [_ctx setObject:folder ? folder : [NSNull null] - forKey:@"ActiveUserHomeFolder"]; + [(WOContext *)_ctx setObject:folder ? folder : [NSNull null] + forKey:@"ActiveUserHomeFolder"]; return folder; } - (id)schedulingCalendarInContext:(id)_ctx { /* Note: watch out for cyclic references */ id folder; - - if ((folder = [_ctx objectForKey:@"ActiveUserCalendar"]) != nil) + + folder = [(WOContext *)_ctx objectForKey:@"ActiveUserCalendar"]; + if (folder != nil) return [folder isNotNull] ? folder : nil; folder = [self homeFolderInContext:_ctx]; @@ -120,8 +122,8 @@ if ([folder isKindOfClass:[NSException class]]) return folder; - [_ctx setObject:folder ? folder : [NSNull null] - forKey:@"ActiveUserCalendar"]; + [(WOContext *)_ctx setObject:folder ? folder : [NSNull null] + forKey:@"ActiveUserCalendar"]; return folder; } diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version index 55664e75..a5eb45d1 100644 --- a/SOGo/SoObjects/SOGo/Version +++ b/SOGo/SoObjects/SOGo/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=61 +SUBMINOR_VERSION:=62 # v0.9.60 requires libNGiCal v4.5.49 # v0.9.50 requires libGDLContentStore v4.5.30 diff --git a/SOGo/SoObjects/common.make b/SOGo/SoObjects/common.make index 7c27da13..e3d4b3ae 100644 --- a/SOGo/SoObjects/common.make +++ b/SOGo/SoObjects/common.make @@ -10,14 +10,15 @@ BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINO WOBUNDLE_EXTENSION = $(BUNDLE_EXTENSION) WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR) +SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib + ADDITIONAL_INCLUDE_DIRS += \ -I.. \ -I../.. ADDITIONAL_LIB_DIRS += \ -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \ - -L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \ - -L/usr/local/lib -L/usr/lib + -L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ BUNDLE_LIBS += \ -lSOGo \ -- 2.39.5