LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 4a2e7b98be9bf00419ec1e19e3bfda5b9b0a9f8f 

Monotone-Revision: 20ebf3a5a63320cd182175f76e87a294bcbcffa3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-06T19:47:20
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-10-06 19:47:20 +00:00
parent e8debc37e3
commit b391953aa4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-10-06 Wolfgang Sourdeau <wsourdeau@inverse.ca> 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: * OpenChange/MAPIStoreContext.m:
(-getMessageTableChildproperty:atURL:withTag:inFolder:withFID:) (-getMessageTableChildproperty:atURL:withTag:inFolder:withFID:)
added response for PR_ROW_TYPE (always 1) and PR_DEPTH (always 0). added response for PR_ROW_TYPE (always 1) and PR_DEPTH (always 0).

8
SoObjects/SOGo/SOGoUser.m
View File

@ -502,7 +502,7 @@
- (void) _appendSystemMailAccount - (void) _appendSystemMailAccount
{ {
NSString *fullName, *imapLogin, *imapServer, *signature, *encryption, NSString *fullName, *imapLogin, *imapServer, *signature, *encryption,
*scheme, *action; *scheme, *action, *query;
NSMutableDictionary *mailAccount, *identity, *mailboxes, *receipts; NSMutableDictionary *mailAccount, *identity, *mailboxes, *receipts;
NSNumber *port; NSNumber *port;
NSMutableArray *identities; NSMutableArray *identities;
@ -540,14 +540,16 @@
// 3. port & encryption // 3. port & encryption
scheme = [url scheme]; scheme = [url scheme];
if ([scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame) if (scheme
&& [scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame)
{ {
encryption = @"ssl"; encryption = @"ssl";
defaultPort = 993; defaultPort = 993;
} }
else else
{ {
if ([[url query] caseInsensitiveCompare: @"tls=YES"] == NSOrderedSame) query = [url query];
if (query && [query caseInsensitiveCompare: @"tls=YES"] == NSOrderedSame)
encryption = @"tls"; encryption = @"tls";
else else
encryption = @"none"; encryption = @"none";