fixed duplicate -awake

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

diff --git a/sope-appserver/NGObjWeb/WODynamicElement.m b/sope-appserver/NGObjWeb/WODynamicElement.m
index 1141b0a29b668f1aac4bacef3971fd4c3dee82bc..bd74f22cbb164e0a58f200f4e298f1f0abb2b8f6 100644 (file)
--- a/sope-appserver/NGObjWeb/WODynamicElement.m
+++ b/sope-appserver/NGObjWeb/WODynamicElement.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: WODynamicElement.m 1 2004-08-20 10:08:27Z znek $
 
 #include <NGObjWeb/WODynamicElement.h>
 #include "WOElement+private.h"
@@ -117,7 +116,7 @@ static Class FormElementClass = Nil;
   
   [self->otherTagString release];
 
-  if ((ea = self->extraAttributes)) { // GC
+  if ((ea = self->extraAttributes) != NULL) { // GC
     register unsigned short i;
     
     [ea->extraString release];
@@ -145,14 +144,15 @@ static Class FormElementClass = Nil;
   NSEnumerator    *ke;
   NSString        *key;
   NSMutableString *es;
-  
+
   if ([_extras count] == 0)
     /* no extra attributes ... */
     return;
   
   if (self->extraAttributes) {
-    NSLog(@"ERROR(%s): tried to reset extra attributes (access denied) !!!",
-          __PRETTY_FUNCTION__);
+    [self errorWithFormat:
+            @"(%s): tried to reset extra attributes (access denied) !!!",
+            __PRETTY_FUNCTION__];
     return;
   }