minor change with great impact on gnustep-base usability ;-)

[sope] / sope-appserver / NGObjWeb / SNSConnection.m

diff --git a/sope-appserver/NGObjWeb/SNSConnection.m b/sope-appserver/NGObjWeb/SNSConnection.m
index 43276da16d89d3cb1670a738cb47e3f99e13dce9..641e03eccddf1166b9b25dbdacd1b03b3412b69c 100644 (file)
--- a/sope-appserver/NGObjWeb/SNSConnection.m
+++ b/sope-appserver/NGObjWeb/SNSConnection.m
@@ -1,24 +1,23 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE 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
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SNSConnection.h"
 #include <NGObjWeb/WOApplication.h>
@@ -94,8 +93,9 @@ typedef enum {
   
   sns = NGSocketAddressFromString([ud stringForKey:@"SNSPort"]);
   if (sns == nil) {
-    NSLog(@"ERROR(%s): Could not create socket address for snsd(port=%@).",
-          __PRETTY_FUNCTION__, sns);
+    [self errorWithFormat:
+            @"(%s): Could not create socket address for snsd(port=%@).",
+            __PRETTY_FUNCTION__, sns];
     RELEASE(self);
     return;
   }
@@ -127,8 +127,9 @@ typedef enum {
 #endif
   
   if (![self->socket isConnected]) {
-    NSLog(@"ERROR: Could not connect socket %@ to snsd (port=%@), "
-          @"terminating: %@", self->socket, sns, [self->socket lastException]);
+    [self errorWithFormat:@"Could not connect socket %@ to snsd (port=%@), "
+            @"terminating: %@",
+            self->socket, sns, [self->socket lastException]];
     ASSIGN(self->socket, (id)nil);
     RELEASE(self);
     [[WOApplication application] terminate];
@@ -150,7 +151,7 @@ typedef enum {
   NS_ENDHANDLER;
   
   if (self->socket == nil) {
-    NSLog(@"ERROR: Could not register with snsd (port=%@).", sns);
+    [self errorWithFormat:@"Could not register with snsd (port=%@).", sns];
     RELEASE(self);
     return;
   }
@@ -359,7 +360,7 @@ typedef enum {
 }
 
 - (void)lostConnectionToNameServer:(NSException *)_exception {
-  NSLog(@"ERROR: application lost connection to snsd: %@", _exception);
+  [self errorWithFormat:@"application lost connection to snsd: %@", _exception];
   [[WOApplication application] terminate];
 }
 - (void)lostConnectionToNameServer {