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

Fix for bug #3039 

Monotone-Parent: 6c02bf9631ff4ffa77f3dd2068fdf632d29bcc25
Monotone-Revision: fd6739c8912ccda074f93108e73623ee0dcc2d1b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-10-17T02:17:56
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2008-10-17 02:17:56 +00:00
parent 1476b9f8cd
commit 0b09c1b52b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UI/Contacts/UIxContactFoldersView.m
View File

@ -42,6 +42,7 @@
#import <SoObjects/SOGo/SOGoPermissions.h>
#import <SoObjects/SOGo/SOGoUser.h>
#import <SoObjects/SOGo/NSArray+Utilities.h>
#import <SoObjects/SOGo/NSDictionary+Utilities.h>
#import <SoObjects/SOGo/NSString+Utilities.h>
#import <SoObjects/Contacts/SOGoContactFolders.h>
#import <SoObjects/Contacts/SOGoContactFolder.h>
@ -192,6 +193,7 @@ withSearchOn: (NSString *) contact
NSString *searchText, *mail;
NSDictionary *contact, *data;
NSArray *folders, *contacts, *descriptors, *sortedContacts;
NSMutableArray *sortedFolders;
NSMutableDictionary *uniqueContacts;
unsigned int i, j;
NSSortDescriptor *displayNameDescriptor;
@ -201,10 +203,20 @@ withSearchOn: (NSString *) contact
{
//NSLog(@"Search all contacts: %@", searchText);
folders = [[self clientObject] subFolders];
sortedFolders = [NSMutableArray arrayWithCapacity: [folders count]];
uniqueContacts = [NSMutableDictionary dictionary];
/* We first search in LDAP folders (in case of duplicated entries in GCS folders) */
for (i = 0; i < [folders count]; i++)
{
folder = [folders objectAtIndex: i];
if ([folder isKindOfClass: [SOGoContactLDAPFolder class]])
[sortedFolders insertObject: folder atIndex: 0];
else
[sortedFolders addObject: folder];
}
for (i = 0; i < [sortedFolders count]; i++)
{
folder = [sortedFolders objectAtIndex: i];
//NSLog(@" Address book: %@ (%@)", [folder displayName], [folder class]);
contacts = [folder lookupContactsWithFilter: searchText
sortBy: @"displayName"