From b75124575308f305070cd6087c0492235b626f9c Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 26 Sep 2004 17:31:37 +0000 Subject: [PATCH] fixed a warning in resource manager git-svn-id: http://svn.opengroupware.org/SOPE/trunk@171 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/OWResourceManager.m | 11 ----------- sope-appserver/NGObjWeb/Version | 2 +- sope-core/NGStreams/NGTextStream.m | 7 +++---- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index c5412c73..4e2edff7 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-09-26 Helge Hess + + * OWResourceManager.m: removed a warning on a missing path on MacOSX + (v4.3.46) + 2004-09-24 Helge Hess * SoObjects/SoProductRegistry.m: do not abort scanning for SOPE diff --git a/sope-appserver/NGObjWeb/OWResourceManager.m b/sope-appserver/NGObjWeb/OWResourceManager.m index 4e48529d..4e2f0ea0 100644 --- a/sope-appserver/NGObjWeb/OWResourceManager.m +++ b/sope-appserver/NGObjWeb/OWResourceManager.m @@ -148,17 +148,6 @@ _pathExists(OWResourceManager *self, NSFileManager *fm, NSString *path) } - (id)initWithPath:(NSString *)_path { -#if __APPLE__ - if ([_path length] == 0) { - NSLog(@"ERROR(%s): missing path!", __PRETTY_FUNCTION__); - /* this doesn't work with subclasses which do not require a path ... */ -#if 0 - [self release]; - return nil; -#endif - } -#endif - if ((self = [super init])) { NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; NSString *rprefix = nil; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 7e7209b2..5a4a450a 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=45 +SUBMINOR_VERSION:=46 # v4.3.42 requires libNGExtensions v4.3.116 # v4.3.40 requires libNGExtensions v4.3.115 diff --git a/sope-core/NGStreams/NGTextStream.m b/sope-core/NGStreams/NGTextStream.m index 037aa67e..472b013f 100644 --- a/sope-core/NGStreams/NGTextStream.m +++ b/sope-core/NGStreams/NGTextStream.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2000-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. 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 @@ -18,10 +18,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ -#include "common.h" #include "NGTextStream.h" +#include "common.h" @implementation NGTextStream -- 2.39.5