From 65391c2bdbe39cad3c69dd3bf741d851db7fc27d Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 12 Feb 2007 19:35:55 +0000 Subject: [PATCH] fixed a few gstep-base compilation warnings git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1427 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGXmlRpc/ChangeLog | 4 ++++ sope-appserver/NGXmlRpc/NGXmlRpcClient.m | 6 ++++-- sope-appserver/NGXmlRpc/Version | 2 +- sope-gdl1/GDLContentStore/ChangeLog | 4 ++++ sope-gdl1/GDLContentStore/GCSFolder.m | 3 ++- sope-gdl1/GDLContentStore/Version | 2 +- sope-mime/ChangeLog | 4 ++++ sope-mime/NGImap4/ChangeLog | 5 +++++ sope-mime/NGImap4/NGImap4Functions.m | 11 ++++++----- sope-mime/NGImap4/NGSieveClient.m | 5 +++-- 10 files changed, 34 insertions(+), 12 deletions(-) diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog index 614696c0..44120b43 100644 --- a/sope-appserver/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,3 +1,7 @@ +2007-02-12 Helge Hess + + * NGXmlRpcClient.m: fixed a gnustep-base compilation warning (v4.7.16) + 2006-07-03 Helge Hess * use %p for pointer formats, fixed gcc 4.1 warnings, use -isNotEmpty diff --git a/sope-appserver/NGXmlRpc/NGXmlRpcClient.m b/sope-appserver/NGXmlRpc/NGXmlRpcClient.m index 0b433657..4d1fc810 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpcClient.m +++ b/sope-appserver/NGXmlRpc/NGXmlRpcClient.m @@ -1,5 +1,6 @@ /* - Copyright (C) 2000-2005 SKYRIX Software AG + Copyright (C) 2000-2007 SKYRIX Software AG + Copyright (C) 2007 Helge Hess This file is part of SOPE. @@ -80,7 +81,8 @@ } if ((self = [super init])) { - self->httpConnection = [[[self connectionClass] alloc] initWithURL:url]; + self->httpConnection = + [(WOHTTPConnection *)[[self connectionClass] alloc] initWithURL:url]; if ([[url scheme] hasPrefix:@"http"]) self->uri = [[url path] copy]; diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version index cabd6ef3..0a8bca08 100644 --- a/sope-appserver/NGXmlRpc/Version +++ b/sope-appserver/NGXmlRpc/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=15 +SUBMINOR_VERSION:=16 diff --git a/sope-gdl1/GDLContentStore/ChangeLog b/sope-gdl1/GDLContentStore/ChangeLog index 899ece9c..269d7350 100644 --- a/sope-gdl1/GDLContentStore/ChangeLog +++ b/sope-gdl1/GDLContentStore/ChangeLog @@ -1,3 +1,7 @@ +2007-02-12 Helge Hess + + * GCSFolder.m: fixed a gnustep-base compilation warning (v4.7.40) + 2007-02-09 Helge Hess * use -errorWithFormat:, fixed a few logging crashes (incomplete format diff --git a/sope-gdl1/GDLContentStore/GCSFolder.m b/sope-gdl1/GDLContentStore/GCSFolder.m index 5f8144c8..cdac1c30 100644 --- a/sope-gdl1/GDLContentStore/GCSFolder.m +++ b/sope-gdl1/GDLContentStore/GCSFolder.m @@ -365,7 +365,8 @@ static GCSStringFormatter *stringFormatter = nil; if ([_value isKindOfClass:NSNumberClass]) { #if GNUSTEP_BASE_LIBRARY _value = [_value stringValue]; - return ([_value hasPrefix:@"Y"] || [_value hasPrefix:@"N"]) + return ([(NSString *)_value hasPrefix:@"Y"] || + [(NSString *)_value hasPrefix:@"N"]) ? ([_value boolValue] ? @"1" : @"0") : _value; #endif diff --git a/sope-gdl1/GDLContentStore/Version b/sope-gdl1/GDLContentStore/Version index 494b71be..28606453 100644 --- a/sope-gdl1/GDLContentStore/Version +++ b/sope-gdl1/GDLContentStore/Version @@ -2,7 +2,7 @@ MAJOR_VERSION:=4 MINOR_VERSION:=7 -SUBMINOR_VERSION:=39 +SUBMINOR_VERSION:=40 # v4.5.29 requires libNGExtensions v4.5.161 # v4.5.26 does not require libNGiCal anymore diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog index b57bfb48..b0536d22 100644 --- a/sope-mime/ChangeLog +++ b/sope-mime/ChangeLog @@ -1,3 +1,7 @@ +2007-02-12 Helge Hess + + * NGImap4: fixed a gstep-base compilation warning (v4.7.243) + 2006-08-03 Wolfgang Sourdeau * NGImap4: improved subfolder handling (v4.5.242) diff --git a/sope-mime/NGImap4/ChangeLog b/sope-mime/NGImap4/ChangeLog index f0e3f312..86c26763 100644 --- a/sope-mime/NGImap4/ChangeLog +++ b/sope-mime/NGImap4/ChangeLog @@ -1,3 +1,8 @@ +2007-02-12 Helge Hess + + * NGImap4Functions.m, NGSieveClient.m: fixed a gstep-base compilation + warning + 2006-08-03 Wolfgang Sourdeau * NGImap4Connection.m: check for \noinferiors flags when traversing diff --git a/sope-mime/NGImap4/NGImap4Functions.m b/sope-mime/NGImap4/NGImap4Functions.m index 9d881724..07749f0a 100644 --- a/sope-mime/NGImap4/NGImap4Functions.m +++ b/sope-mime/NGImap4/NGImap4Functions.m @@ -1,5 +1,6 @@ /* - Copyright (C) 2000-2005 SKYRIX Software AG + Copyright (C) 2000-2007 SKYRIX Software AG + Copyright (C) 2007 Helge Hess This file is part of SOPE. @@ -170,9 +171,9 @@ BOOL _deleteSubFolder(id self, NGImap4Folder *_folder) { AW: they will be used in 2 different classes ... 'grep _deleteSubFolder *.m' */ - NSEnumerator *enumerator; - NGImap4Folder *folder; - id ctx; + NSEnumerator *enumerator; + NGImap4Folder *folder; + NGImap4Context *ctx; _checkDefault(); @@ -208,7 +209,7 @@ BOOL _deleteSubFolder(id self, NGImap4Folder *_folder) { } [ctx resetLastException]; - result = [(id)[ctx client] delete:[_folder absoluteName]]; + result = [[ctx client] delete:[_folder absoluteName]]; if (!_checkResult(ctx, result, __PRETTY_FUNCTION__)) { [self resetSubFolders]; diff --git a/sope-mime/NGImap4/NGSieveClient.m b/sope-mime/NGImap4/NGSieveClient.m index 51128459..319bf940 100644 --- a/sope-mime/NGImap4/NGSieveClient.m +++ b/sope-mime/NGImap4/NGSieveClient.m @@ -1,5 +1,6 @@ /* - Copyright (C) 2000-2005 SKYRIX Software AG + Copyright (C) 2000-2007 SKYRIX Software AG + Copyright (C) 2007 Helge Hess This file is part of SOPE. @@ -92,7 +93,7 @@ static BOOL debugImap4 = NO; } + (id)clientWithURL:(id)_url { - return [[[self alloc] initWithURL:_url] autorelease]; + return [[(NGSieveClient *)[self alloc] initWithURL:_url] autorelease]; } + (id)clientWithAddress:(id)_address { -- 2.39.2