Monotone-Parent: c2089bed4b31f45ef9635af961e76d25b48b6c39

Monotone-Revision: f730d4e278c5e0cd1036076335b97d03b2219fc1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-05T15:45:10
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-06-05 15:45:10 +00:00
parent 980b7a592e
commit f6749854a6
2 changed files with 11 additions and 0 deletions
+5
View File
@@ -1,5 +1,10 @@
2007-06-05 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoObject.m ([SOGoObject
-_urlPreferringParticle:expectedoverThisOne:possible]): remove the
first 3 elements of the path array if the url returned by
baseURLInContext: returns a hostname.
* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
-_adjustOwner]): sharedFolderName and otherUsersFolderName may be
nil, in which case a crash happens when calling hasPrefix:.
+6
View File
@@ -828,6 +828,12 @@ static BOOL kontactGroupDAV = YES;
baseURL = [[self baseURLInContext: context] stringByUnescapingURL];
path = [NSMutableArray arrayWithArray: [baseURL componentsSeparatedByString:
@"/"]];
if ([baseURL hasPrefix: @"http"])
{
[path removeObjectAtIndex: 2];
[path removeObjectAtIndex: 1];
[path removeObjectAtIndex: 0];
}
urlMethod = [path objectAtIndex: 2];
if (![urlMethod isEqualToString: expected])
{