Monotone-Parent: 4649d6842fe70a3e582c138faf9776802809704a

Monotone-Revision: 7df1edc5e4fb86c8fe01354ff89b73239e5a4e37

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-29T21:44:04
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-11-29 21:44:04 +00:00
parent 12b8c7a427
commit 43dfb25589
3 changed files with 12 additions and 52 deletions
+1 -22
View File
@@ -100,8 +100,6 @@
- (id) initFromUDSource: (NSDictionary *) udSource
inDomain: (NSString *) sourceDomain
{
NSString *udDomainAttribute;
self = [self init];
ASSIGN(_sourceID, [udSource objectForKey: @"id"]);
@@ -115,27 +113,8 @@
_viewURL = [[NSURL alloc] initWithString: [udSource objectForKey: @"viewURL"]];
#warning this domain code has no effect yet
/* FIXME: the queries below do not setup c_domain. */
udDomainAttribute = [udSource objectForKey: @"domainAttribute"];
if ([sourceDomain length])
{
if ([udDomainAttribute length])
{
[self errorWithFormat: @"cannot define 'domainAttribute'"
@" for a domain-based source (%@)", _sourceID];
[self autorelease];
return nil;
}
else
{
ASSIGN (_domain, sourceDomain);
}
}
else
{
if ([udDomainAttribute length])
ASSIGN (_domainAttribute, udDomainAttribute);
}
ASSIGN (_domain, sourceDomain);
if (!_viewURL)
{