From dd8cccdafcc20557ab36e9181b700bbc74ad71fe Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 3 Feb 2017 15:24:42 -0500
Subject: [PATCH] (fix) correctly handle Canceled appointments

---
 ActiveSync/SOGoActiveSyncDispatcher.m  | 5 +----
 ActiveSync/SOGoMailObject+ActiveSync.m | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 6491d9ec3..463f67af7 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -1820,10 +1820,7 @@ void handle_eas_terminate(int signum)
             {
               appointmentObject = [[SOGoAppointmentObject alloc] initWithName: [NSString stringWithFormat: @"%@.ics", [event uid]]
                                                                   inContainer: collection];
-              if (folderType == ActiveSyncEventFolder)
-                [appointmentObject saveComponent: event force: YES];
-              else
-                [appointmentObject saveComponent: event];
+              [appointmentObject saveComponent: event force: YES];
            }
 
           if (uidCache && [calendarId length] > 64)
diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index 34bf09cde..7cb58f06b 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -944,7 +944,7 @@ struct GlobalObjectId {
       else if ([method isEqualToString: @"COUNTER"])
         className = @"IPM.Schedule.Meeting.Resp.Tent";
       else if ([method isEqualToString: @"CANCEL"])
-        className = @"IPM.Schedule.Meeting.Cancelled";
+        className = @"IPM.Schedule.Meeting.Canceled";
       else
         className = @"IPM.Appointment";