fixed some config.make issue

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@298 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 6e981dbd8d73133166a7b3078ab99b8ce1286548..bc17e506a2fae7574fa4ebd68a632f87069902fa 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-21  Helge Hess  <helge.hess@skyrix.com>
+
+       * DynamicElements/WOImage.m: minor code cleanup (v4.3.69)
+
 2004-10-19  Helge Hess  <helge.hess@skyrix.com>
        
        * SoObjects/SoHTTPAuthenticator.m: return 401 instead of 400 if the

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOImage.h b/sope-appserver/NGObjWeb/DynamicElements/WOImage.h
index 72fcf5cbabfe7a6d2cfb95df63d80ad9783c238d..3a98ef19021e6824a2508a4e0a7505b7b62ea183 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOImage.h
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOImage.h
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #ifndef __NGObjWeb_DynElems_WOImage_H__
 #define __NGObjWeb_DynElems_WOImage_H__
@@ -40,6 +39,8 @@
     data
     mimeType
     key
+
+  TODO: add support for "?" parameters?
 */
 
 @interface WOImage : WOHTMLDynamicElement

diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOImage.m b/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
index 404a13c2760882d8c5246073c0b6936a92f5a634..e8203bcf6eca34bbad17eca6b8bf784e93138cda 100644 (file)
--- a/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
+++ b/sope-appserver/NGObjWeb/DynamicElements/WOImage.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: WOImage.m 1 2004-08-20 10:08:27Z znek $
 
 #include "WOImage.h"
 
@@ -304,22 +303,25 @@
 }
 
 - (void)dealloc {
-  RELEASE(self->src);
+  [self->src release];
   [super dealloc];
 }
 
 /* HTML generation */
 
 - (void)_appendSrcToResponse:(WOResponse *)_resp inContext:(WOContext *)_ctx {
-  [_resp appendContentHTMLAttributeValue:
-           [self->src stringValueInComponent:[_ctx component]]];
+  NSString *s;
+  
+  s = [self->src stringValueInComponent:[_ctx component]];
+  if (s != nil) [_resp appendContentHTMLAttributeValue:s];
 }
 
 /* description */
 
 - (NSString *)associationDescription {
-  NSMutableString *str = [NSMutableString stringWithCapacity:64];
-
+  NSMutableString *str;
+  
+  str = [NSMutableString stringWithCapacity:64];
   [str appendFormat:@" src=%@", self->src];
   [str appendString:[super associationDescription]];
   return str;

diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index 9c7df5af2d7b253ad36c7aa90dd7a2b2f0bec425..a5f87a55e0042ab356df5c7c2cc7210026ae1566 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-21  Helge Hess  <helge.hess@skyrix.com>
+
+       * WETableView/GNUmakefile: added support for config.make (v4.3.61)
+
 2004-10-04  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * WEExtensions.xcode: updated to current build version

diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version
index 7fbe8ee140e3623022ccc65103109611c7a3231a..9846aa8db05721ef7bf9a4da045b7975d2286ffb 100644 (file)
--- a/sope-appserver/WEExtensions/Version
+++ b/sope-appserver/WEExtensions/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=60
+SUBMINOR_VERSION:=61

diff --git a/sope-appserver/WEExtensions/WETableView/GNUmakefile b/sope-appserver/WEExtensions/WETableView/GNUmakefile
index c6dfbbcbdc40a1a64ddbc2881bcb39c94aa1f5ce..e2d2285ee371217de237e6ea4f720b9568c4af64 100644 (file)
--- a/sope-appserver/WEExtensions/WETableView/GNUmakefile
+++ b/sope-appserver/WEExtensions/WETableView/GNUmakefile
@@ -1,5 +1,6 @@
-# $Id$
+# GNUstep makefile
 
+-include ../../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 SUBPROJECT_NAME = WETableView