From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 18 Mar 2007 09:47:29 +0000 (+0000)
Subject: fixed some gcc 4.1 warnings
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ad37908c95010220068b67e94811a65b56222c4;p=sope

fixed some gcc 4.1 warnings


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

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 1faa09bd..f070be25 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-22  Helge Hess  <helge.hess@opengroupware.org>
+
+	* WORequest.m, WebDAV/SoWebDAVRenderer.m: fixed a gcc 4.1 warning
+	  (v4.7.6)
+
 2007-03-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* v4.7.5
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 3e15b7be..1cc02950 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=5
+SUBMINOR_VERSION:=6
 
 # v4.5.234 requires libDOM          v4.5.21
 # v4.5.214 requires libNGExtensions v4.5.179
diff --git a/sope-appserver/NGObjWeb/WORequest.m b/sope-appserver/NGObjWeb/WORequest.m
index a8c6f465..421947d3 100644
--- a/sope-appserver/NGObjWeb/WORequest.m
+++ b/sope-appserver/NGObjWeb/WORequest.m
@@ -684,7 +684,7 @@ static BOOL debugOn = NO;
   v = [self formValueForKey:WORequestValueFragmentID];
   if (v == nil) return nil;
   v = [v stringByTrimmingWhiteSpaces];
-  return [v isNotEmpty] ? v : nil;
+  return [v isNotEmpty] ? v : (NSString *)nil;
 }
 
 - (BOOL)isFragmentIDInRequest {
diff --git a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
index 94a801a4..d1cbaf50 100644
--- a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
@@ -378,7 +378,7 @@ static BOOL         useRelativeURLs = YES;
 	continue;
       
       tag = [[item objectAtIndex:0] stringValue];
-      ns  = (count > 1) ? [[item objectAtIndex:1] stringValue] : nil;
+      ns  = (count > 1) ? [[item objectAtIndex:1] stringValue]:(NSString*)nil;
       pre = (count > 2) ? [[item objectAtIndex:2] stringValue] : davNS;
 
       [ms appendString:@"<"];