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

Monotone-Parent: 251f8d592e13145690e537b81efeff57506f18cc 

Monotone-Revision: 4b7f399fbc3a148bb537b71896b85b75569d5f5f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-09-02T20:51:24
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-09-02 20:51:24 +00:00
parent 71670d5277
commit 8b1b45dab9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -9,6 +9,10 @@
2010-09-02 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2010-09-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Contacts/UIxContactFoldersView.m (-allContactSearchAction):
inverted the contact/list condition test as the vlist test is
faster to execute.
* UI/MailerUI/UIxMailView.m (_receiptMessageHeaderTo:): properly * UI/MailerUI/UIxMailView.m (_receiptMessageHeaderTo:): properly
escape the message subject in QP when needed. escape the message subject in QP when needed.

10
UI/Contacts/UIxContactFoldersView.m
View File

@ -207,11 +207,7 @@
mail = [contact objectForKey: @"c_mail"]; mail = [contact objectForKey: @"c_mail"];
//NSLog(@" found %@ (%@) ? %@", [contact objectForKey: @"c_name"], mail, //NSLog(@" found %@ (%@) ? %@", [contact objectForKey: @"c_name"], mail,
// [contact description]); // [contact description]);
if ([mail isNotNull] if (!excludeLists && [[contact objectForKey: @"c_component"]
&& [uniqueContacts objectForKey: mail] == nil
&& !(excludeGroups && [contact objectForKey: @"isGroup"]))
[uniqueContacts setObject: contact forKey: mail];
else if (!excludeLists && [[contact objectForKey: @"c_component"]
isEqualToString: @"vlist"]) isEqualToString: @"vlist"])
{ {
[contact setObject: [folder nameInContainer] [contact setObject: [folder nameInContainer]
@ -219,6 +215,10 @@
[uniqueContacts setObject: contact [uniqueContacts setObject: contact
forKey: [contact objectForKey: @"c_name"]]; forKey: [contact objectForKey: @"c_name"]];
} }
else if ([mail length]
&& [uniqueContacts objectForKey: mail] == nil
&& !(excludeGroups && [contact objectForKey: @"isGroup"]))
[uniqueContacts setObject: contact forKey: mail];
} }
} }
if ([uniqueContacts count] > 0) if ([uniqueContacts count] > 0)