Renamed SOGoEnableDomainWithUID to SOGoEnableDomainBasedUID.

Monotone-Parent: 297140f163083c23ae6ed58e7f2fe17a62277d31
Monotone-Revision: 6d9f4a1dbd4808e626cd25041219c5bb22a5626f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-19T16:25:11
Monotone-Branch: ca.inverse.sogo
Monotone-Tag: SOGo_v1.3.8a
Monotone-Tag: v1.3.8a

SoObjects/SOGo/SOGoUserFolder.m

@@ -397,7 +397,7 @@
   NSString *field, *login, *domain;
   NSArray *users;
   int i;
-  BOOL enableDomainWithUID;
+  BOOL enableDomainBasedUID;
 
 #warning the attributes returned here should match the one requested in the query
   fetch = [NSMutableString string];
@@ -405,7 +405,7 @@
   login = [[context activeUser] login];
   um = [SOGoUserManager sharedUserManager];
   sd = [SOGoSystemDefaults sharedSystemDefaults];
-  enableDomainWithUID = [sd enableDomainWithUID];
+  enableDomainBasedUID = [sd enableDomainBasedUID];
   domain = [[context activeUser] domain];
   domains = [[sd visibleDomainsForDomain: domain] objectEnumerator];
   while (domain)
@@ -418,7 +418,7 @@
         {
           currentUser = [users objectAtIndex: i];
           field = [currentUser objectForKey: @"c_uid"];
-          if (enableDomainWithUID)
+          if (enableDomainBasedUID)
             field = [NSString stringWithFormat: @"%@@%@", field, domain];
           if (![field isEqualToString: login])
             {