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

See ChangeLog 

Monotone-Parent: 82564e2898976a6c09a85817e4b2954a5c58b7a9
Monotone-Revision: 387161e51d5f56bffe765c8e46dec729db13794d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-11-21T14:15:14
maint-2.0.2
Ludovic Marcotte 2011-11-21 14:15:14 +00:00
parent b5fdc4a7c9
commit 79c0c2362b
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2011-11-21 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/WORequest+SOGo.m - for now, we consider iCal 4
and iCal 5 to be the same and added new strings to recognize
Apple Address Book on Mac OS X 10.7 (Lion)
* SoObjects/Contacts/SOGoContactGCSFolder.m - we now skip list
if we deal with Apple Address Book. If we don't do this and
a "vlist" is present, no card will be displayed at all.
2011-11-16 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/SOGoSieveManager.m (-updateFiltersForLogin:...)

2
SoObjects/Contacts/SOGoContactGCSFolder.m
View File

@ -157,7 +157,7 @@ static NSArray *folderListingFields = nil;
[obj setIsNew: YES];
}
}
if (!obj)
if (!obj || ([obj isKindOfClass: [SOGoContactGCSList class]] && [[_ctx request] isMacOSXAddressBookApp]))
obj = [NSException exceptionWithHTTPStatus:404 /* Not Found */];
}

21
SoObjects/SOGo/WORequest+SOGo.m
View File

@ -134,19 +134,34 @@
return [self isAppleDAVWithSubstring: @"Mac OS X/10."];
}
//
// sogod[22188] -[WEClientCapabilities initWithRequest:]: Unknown WebClient: user-agent='CalendarStore/5.0.1 (1139.14); iCal/5.0.1 (1547.4); Mac OS X/10.7.2 (11C74)'
//
//
- (BOOL) isICal4
{
return [self isAppleDAVWithSubstring: @"iCal/4."];
return ([self isAppleDAVWithSubstring: @"iCal/4."] ||
[self isAppleDAVWithSubstring: @"iCal/5."]);
}
//
// Starting from 10.7, we see something like:
//
// sogod[27330] -[WEClientCapabilities initWithRequest:]: Unknown WebClient: user-agent='AddressBook/6.1 (1062) CardDAVPlugin/196 CFNetwork/520.2.5 Mac_OS_X/10.7.2 (11C74)'
//
- (BOOL) isMacOSXAddressBookApp
{
WEClientCapabilities *cc;
BOOL b;
cc = [self clientCapabilities];
return ([[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound
&& [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound);
b = [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound &&
([[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound ||
[[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound);
return b;
}
- (BOOL) isIPhoneAddressBookApp