merge of '0dd67af506445aca2871edc97a4383c609e20c42'

and '177ce0927201d7757ef2447dd1dbd4dab62930ae'

Monotone-Parent: 0dd67af506445aca2871edc97a4383c609e20c42
Monotone-Parent: 177ce0927201d7757ef2447dd1dbd4dab62930ae
Monotone-Revision: 78dcdb9c4c1457146fc206115afe39e0596352f3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-12-04T23:20:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-12-04 23:20:02 +00:00

View File

@@ -190,7 +190,7 @@
SoSecurityManager *securityManager;
securityManager = [SoSecurityManager sharedSecurityManager];
// return (([securityManager validatePermission: SoPerm_AccessContentsInformation
// onObject: contactFolder
// inContext: context] == nil)
@@ -294,8 +294,7 @@
responseString = [NSMutableString new];
contacts = [results objectEnumerator];
contact = [contacts nextObject];
while (contact)
while ((contact = [contacts nextObject]))
{
uid = [contact objectForKey: @"c_uid"];
folders = [self _foldersForUID: uid ofType: folderType];
@@ -305,7 +304,6 @@
[contact objectForKey: @"cn"],
[contact objectForKey: @"c_email"],
foldersString];
contact = [contacts nextObject];
}
[response appendContentString: responseString];
[responseString release];