From 1d9febb51139924ac7563c43e7ceeb9d2f54f4b2 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 10 Jan 2014 14:10:16 -0500
Subject: [PATCH] Correctly handle the Active Sync requests

---
 SoObjects/SOGo/SOGoUserFolder.h | 6 +++++-
 SoObjects/SOGo/WORequest+SOGo.m | 6 ++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/SoObjects/SOGo/SOGoUserFolder.h b/SoObjects/SOGo/SOGoUserFolder.h
index fb1c1441f..4ee6bdd65 100644
--- a/SoObjects/SOGo/SOGoUserFolder.h
+++ b/SoObjects/SOGo/SOGoUserFolder.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2013 Inverse inc.
+  Copyright (C) 2006-2014 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of SOGo.
@@ -40,6 +40,7 @@
 @class NSDictionary;
 @class NSString;
 @class WOContext;
+@class SOGoAppointmentFolders;
 @class SOGoContactFolders;
 
 @interface SOGoUserFolder : SOGoFolder
@@ -60,6 +61,9 @@
 - (BOOL) collectionDavKey: (NSString *) key
 		  matches: (NSString *) value;
 
+- (SOGoAppointmentFolders *) privateCalendars: (NSString *) key
+				    inContext: (WOContext *) localContext;
+
 - (SOGoContactFolders *) privateContacts: (NSString *) _key
                                inContext: (WOContext *) _ctx;
 
diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m
index 9c803a0f1..b622fb1d1 100644
--- a/SoObjects/SOGo/WORequest+SOGo.m
+++ b/SoObjects/SOGo/WORequest+SOGo.m
@@ -1,8 +1,6 @@
 /* WORequest+SOGo.m - this file is part of SOGo
  *
- * Copyright (C) 2007-2010 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2007-2013 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
@@ -37,7 +35,7 @@
 - (BOOL) handledByDefaultHandler
 {
 #warning this should be changed someday
-  return ![[self requestHandlerKey] isEqualToString:@"dav"];
+  return !([[self requestHandlerKey] isEqualToString: @"dav"] || [[self requestHandlerKey] isEqualToString: @"Microsoft-Server-ActiveSync"]);
 }
 
 - (NSArray *) _propertiesOfElement: (id <DOMElement>) startElement