Monotone-Parent: 279fca526b178f040bcbf469c4a1b60370cae7d9

Monotone-Revision: 3dee1ff445f5268ef4c0f3c4ce1e664d14c8dc7c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-10T21:40:39
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2007-09-10 21:40:39 +00:00
1 parent 6670da2b6f
commit 5b7136db24
2 files changed
+15 -7

No files matched your search

+4
View File
@@ -1,5 +1,9 @@
2007-09-10 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2007-09-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView
-contactSearchAction]): only return the records which have an
email set.
* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject * SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
-trashInContext:_ctx]): no longer expunge the mailbox after -trashInContext:_ctx]): no longer expunge the mailbox after
marking a message deleted. marking a message deleted.
+11 -7
View File
@@ -139,25 +139,29 @@
{ {
WOResponse *response; WOResponse *response;
NSEnumerator *contacts; NSEnumerator *contacts;
NSString *responseString; NSString *responseString, *email;
NSDictionary *contact; NSDictionary *contact;
response = [context response]; response = [context response];
if ([results count] > 0) if ([results count] > 0)
{ {
[response setStatus: 200];
contacts = [results objectEnumerator]; contacts = [results objectEnumerator];
contact = [contacts nextObject]; contact = [contacts nextObject];
if (contact) if (contact)
{ {
responseString = [NSString stringWithFormat: @"%@:%@:%@", email = [contact objectForKey: @"c_email"];
[contact objectForKey: @"c_uid"], if ([email length])
[contact objectForKey: @"cn"], {
[contact objectForKey: @"c_email"]]; responseString = [NSString stringWithFormat: @"%@:%@:%@",
[response setStatus: 200]; [contact objectForKey: @"c_uid"],
[contact objectForKey: @"cn"],
email];
// [response setHeader: @"text/plain; charset=iso-8859-1" // [response setHeader: @"text/plain; charset=iso-8859-1"
// forKey: @"Content-Type"]; // forKey: @"Content-Type"];
[response appendContentString: responseString]; [response appendContentString: responseString];
}
// contact = [contacts nextObject]; // contact = [contacts nextObject];
} }
} }