mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-08-28 09:53:23 +00:00
propagate from branch 'ca.inverse.sogo.1_3_10' (head c4570925f011f2af2dfe09f5e9cc51de5bd1e13e)
to branch 'ca.inverse.sogo' (head 4f36a1c10a12396aed17d84ab4be1adc520d1663) Monotone-Parent: 4f36a1c10a12396aed17d84ab4be1adc520d1663 Monotone-Parent: c4570925f011f2af2dfe09f5e9cc51de5bd1e13e Monotone-Revision: 157b737337e2cd599c6a85f573fbd507b9e7b73e Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-11-21T14:52:42 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user