From fd95a7115a6021a68d556bde249e57de82b36d9f Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 9 Feb 2007 16:53:05 +0000
Subject: [PATCH] Monotone-Parent: 3d9b00a12e01adb2b2f57de56d94b0bb617db89e
 Monotone-Revision: 68fc87916043043a4f4813bda38cca7f315dcdf6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-02-09T16:53:05
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                | 14 +++++++++++---
 UI/SOGoUI/UIxComponent.m | 10 ++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3db79d53..8b1a11da2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+2007-02-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/SOGoUI/UIxComponent.m ([UIxComponent -userFolderPath]): treat
+	resulting url with [NSString+Utilities hostlessURL] instead of
+	using NSURL. This is because the url in question sometimes has a
+	hostname and sometimes not. "hostlessURL" ensure the hostname is
+	removed anyway.
+	([UIxComponent -applicationPath]): same as above.
+
 2007-02-08  Ludovic Marcotte <ludovic@inverse.ca>
 
-        * SoObjects/Mailer/SOGoMailFolder.m
-	  Priorize the look of folders before doing
-	  the one on messages. 
+	* SoObjects/Mailer/SOGoMailFolder.m: priorize the lookup of
+	folders before doing the one on messages.
 
 2007-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 59ab845d6..9c179e8b3 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -285,7 +285,6 @@ static BOOL uixDebugEnabled = NO;
 - (NSString *) userFolderPath
 {
   WOContext *ctx;
-  NSString  *url, *path;
   NSEnumerator *objects;
   SOGoObject *currentObject;
   BOOL found;
@@ -301,16 +300,12 @@ static BOOL uixDebugEnabled = NO;
     else
       currentObject = [objects nextObject];
 
-  url = [currentObject baseURLInContext:ctx];
-  path = [[NSURL URLWithString:url] path];
-
-  return path;
+  return [[currentObject baseURLInContext:ctx] hostlessURL];
 }
 
 - (NSString *) applicationPath
 {
   SOGoObject *currentClient, *parent;
-  NSString *url;
   BOOL found;
   Class objectClass, groupFolderClass, userFolderClass;
   WOContext *ctx;
@@ -333,9 +328,8 @@ static BOOL uixDebugEnabled = NO;
     }
 
   ctx = [self context];
-  url = [currentClient baseURLInContext: ctx];
 
-  return [[NSURL URLWithString: url] path];
+  return [[currentClient baseURLInContext:ctx] hostlessURL];
 }
 
 - (NSString *) resourcesPath