From 6b52e9c945af28188b221f4cbf26e0ee28f58195 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 9 Jan 2015 09:04:15 -0500 Subject: [PATCH] Fix for bug #2960 --- NEWS | 1 + SoObjects/SOGo/WOContext+SOGo.h | 4 +--- SoObjects/SOGo/WOContext+SOGo.m | 4 +--- SoObjects/SOGo/WORequest+SOGo.h | 4 +--- SoObjects/SOGo/WORequest+SOGo.m | 6 +++++- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index c4973a853..fb5aa9831 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ Enhancements Bug fixes - fixed calendar selection in event and task editors (#3049, #3050) - check for resources existence when listing subscribed ones (#3054) + - correctly recognize Apple Calendar on Yosemite (#2960) 2.2.13 (2014-12-30) ------------------- diff --git a/SoObjects/SOGo/WOContext+SOGo.h b/SoObjects/SOGo/WOContext+SOGo.h index f13bbcd0c..c6d50cd68 100644 --- a/SoObjects/SOGo/WOContext+SOGo.h +++ b/SoObjects/SOGo/WOContext+SOGo.h @@ -1,8 +1,6 @@ /* WOContext+SOGo.h - this file is part of SOGo * - * Copyright (C) 2008 Inverse inc. - * - * Author: Francis Lachapelle + * Copyright (C) 2008-2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/SoObjects/SOGo/WOContext+SOGo.m b/SoObjects/SOGo/WOContext+SOGo.m index e5f992ccf..c558b1be6 100644 --- a/SoObjects/SOGo/WOContext+SOGo.m +++ b/SoObjects/SOGo/WOContext+SOGo.m @@ -1,8 +1,6 @@ /* WOContext+SOGo.m - this file is part of SOGo * - * Copyright (C) 2008 Inverse inc. - * - * Author: Francis Lachapelle + * Copyright (C) 2008-2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/SoObjects/SOGo/WORequest+SOGo.h b/SoObjects/SOGo/WORequest+SOGo.h index f749d183c..9ae6c9104 100644 --- a/SoObjects/SOGo/WORequest+SOGo.h +++ b/SoObjects/SOGo/WORequest+SOGo.h @@ -1,8 +1,6 @@ /* WORequest+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse inc. - * - * Author: Wolfgang Sourdeau + * Copyright (C) 2007-2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m index ff3554fd6..f528343dd 100644 --- a/SoObjects/SOGo/WORequest+SOGo.m +++ b/SoObjects/SOGo/WORequest+SOGo.m @@ -1,6 +1,6 @@ /* WORequest+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007-2014 Inverse inc. + * Copyright (C) 2007-2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -127,10 +127,14 @@ || [self isAppleDAVWithSubstring: @"iOS/"]; } +// +// Mac+OS+X/10.10.1 (14B25) CalendarAgent/315 +// - (BOOL) isICal { return ([self isAppleDAVWithSubstring: @"Mac OS X/10."] || [self isAppleDAVWithSubstring: @"Mac_OS_X/"] + || [self isAppleDAVWithSubstring: @"Mac+OS+X/"] || [self isAppleDAVWithSubstring: @"CoreDAV/"]); }