Monotone-Parent: 4a2e7b98be9bf00419ec1e19e3bfda5b9b0a9f8f
Monotone-Revision: 20ebf3a5a63320cd182175f76e87a294bcbcffa3 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-10-06T19:47:20 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
e8debc37e3
commit
b391953aa4
|
@ -1,5 +1,9 @@
|
|||
2010-10-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/SOGoUser.m (-_appendSystemMailAccount): check
|
||||
that -[url scheme] and -[url query] are not null before the
|
||||
comparison, since nil == 0 == NSOrderedSame....
|
||||
|
||||
* OpenChange/MAPIStoreContext.m:
|
||||
(-getMessageTableChildproperty:atURL:withTag:inFolder:withFID:)
|
||||
added response for PR_ROW_TYPE (always 1) and PR_DEPTH (always 0).
|
||||
|
|
|
@ -502,7 +502,7 @@
|
|||
- (void) _appendSystemMailAccount
|
||||
{
|
||||
NSString *fullName, *imapLogin, *imapServer, *signature, *encryption,
|
||||
*scheme, *action;
|
||||
*scheme, *action, *query;
|
||||
NSMutableDictionary *mailAccount, *identity, *mailboxes, *receipts;
|
||||
NSNumber *port;
|
||||
NSMutableArray *identities;
|
||||
|
@ -540,14 +540,16 @@
|
|||
|
||||
// 3. port & encryption
|
||||
scheme = [url scheme];
|
||||
if ([scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame)
|
||||
if (scheme
|
||||
&& [scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame)
|
||||
{
|
||||
encryption = @"ssl";
|
||||
defaultPort = 993;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ([[url query] caseInsensitiveCompare: @"tls=YES"] == NSOrderedSame)
|
||||
query = [url query];
|
||||
if (query && [query caseInsensitiveCompare: @"tls=YES"] == NSOrderedSame)
|
||||
encryption = @"tls";
|
||||
else
|
||||
encryption = @"none";
|
||||
|
|
Loading…
Reference in New Issue