From 452cd5555d04032266a32508d4d39ccc8e40fbd4 Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 11 Aug 2004 10:45:40 +0000
Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/trunk@170
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 SOGo/Main/ChangeLog | 4 ++++
 SOGo/Main/Version   | 2 +-
 SOGo/Main/sogod.m   | 7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog
index 1f8607d0..18be6aa4 100644
--- 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 6b227f7e..0eb47da3 100644
--- 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 15646454..9bfd795d 100644
--- 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;
-- 
2.39.5