git-svn-id: http://svn.opengroupware.org/SOGo/trunk@170 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 1f8607d0f5959fb227d170b81792740c9ea328c8..18be6aa40a1fa73497e3511e8b21974fe28cc219 100644 (file)
--- a/SOGo/Main/ChangeLog
+++ b/SOGo/Main/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-11  Helge Hess  <helge.hess@skyrix.com>
+
+       * sogod.m: do not set SoRootURL manually (v0.9.6)
+
 2004-08-10  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * French.lproj/Locale: minor changes to capitalization (v0.9.5)

diff --git a/SOGo/Main/Version b/SOGo/Main/Version
index 6b227f7e3b266ef9cc7a5dc1fd384537da8702c7..0eb47da345be1d4c8ac5a363234ca3f2c77473cb 100644 (file)
--- a/SOGo/Main/Version
+++ b/SOGo/Main/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=5
+SUBMINOR_VERSION:=6

diff --git a/SOGo/Main/sogod.m b/SOGo/Main/sogod.m
index 15646454f79c86d8bd6febf462440f26dc73e58e..9bfd795d63f53c8dc29497c6502c4724ed1f05fb 100644 (file)
--- a/SOGo/Main/sogod.m
+++ b/SOGo/Main/sogod.m
@@ -109,7 +109,7 @@ static BOOL doCrashOnSessionCreate = NO;
   id obj;
 
   /* put locale info into the context in case it's not there */
-  if(![_ctx valueForKey:@"locale"]) {
+  if (![_ctx valueForKey:@"locale"]) {
       NSArray *langs;
       NSDictionary *locale;
       
@@ -118,10 +118,13 @@ static BOOL doCrashOnSessionCreate = NO;
       [_ctx takeValue:locale forKey:@"locale"];
   }
   
+#if 0 // znek: explain why you did that?
   /* set SoRootURL */
-  if(![_ctx valueForKey:@"SoRootURL"]) {
+  if ([_ctx valueForKey:@"SoRootURL"] == nil) {
       [_ctx takeValue:@"/sogod.woa/so/" forKey:@"SoRootURL"];
   }
+#endif
+  
   /* first check attributes directly bound to the application */
   if ((obj = [super lookupName:_key inContext:_ctx acquire:_flag]))
     return obj;