From 6d07744e366e542c0b39dd9d2f20833fdc946591 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 22 May 2009 21:39:53 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: dec9b1733e709c1ad5b0be7dc9d1c4d9b2f6f991
Monotone-Revision: 3b52714060113176005a0886d4a2e1a33ab89ecc

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-05-22T21:39:53
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog    |  4 ++++
 Main/sogod.m | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b67af94ca..e60ee90f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-05-22  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* Main/sogod.m (main): verify if the default parameter
+	WOApplicationRedirectURL is defined and if so, removed any
+	trailing slash.
+
 	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
 	-_toolbarForOwner:andClientObject:]): ignore the participation
 	status for tasks so the usual edition toolbar appears.
diff --git a/Main/sogod.m b/Main/sogod.m
index fe67168cb..0ec2d3880 100644
--- a/Main/sogod.m
+++ b/Main/sogod.m
@@ -77,7 +77,7 @@ convertOldSOGoDomain (NSUserDefaults *ud)
 int
 main (int argc, char **argv, char **env)
 {
-  NSString *tzName;
+  NSString *tzName, *redirectURL;
   NSUserDefaults *ud;
   NSAutoreleasePool *pool;
   int rc;
@@ -97,6 +97,14 @@ main (int argc, char **argv, char **env)
       ud = [NSUserDefaults standardUserDefaults];
       convertOldSOGoDomain (ud);
 
+      redirectURL = [ud stringForKey: @"WOApplicationRedirectURL"];
+      if (redirectURL && [redirectURL hasSuffix: @"/"])
+	{
+	  [ud setObject: [redirectURL substringToIndex: [redirectURL length] - 1]
+	      forKey: @"WOApplicationRedirectURL"];
+	  [ud synchronize];
+	}
+
       rc = 0;
       tzName = [ud stringForKey: @"SOGoServerTimeZone"];
       if (!tzName)