From 795e1ad398809db6c2b7d11449644b77b01e1b28 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 6 Jun 2011 21:58:46 +0000 Subject: [PATCH] Monotone-Parent: 52ae1dc5cf6c40b252808bb7d1ec3f07b9c076a3 Monotone-Revision: 0274436d9ec9782dc91d65ff2c4760f006d2ca04 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-06-06T21:58:46 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 10 ++++++++++ OpenChange/MAPIStoreContext.m | 14 +++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cdffaacf..ac899446c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-06-06 Wolfgang Sourdeau + + * OpenChange/MAPIStoreTable.m (-notifyChangesForChild:): same as below. + + * OpenChange/MAPIStoreContext.m + (_saveOrSubmitChangesInMessageWithMID:andFlags:save:): + mapistore_push_notification now takes a struct mapistore_context * + as parameter. + (-deleteMessageWithMID:inFID:withFlags:): same as above. + 2011-06-03 Wolfgang Sourdeau * OpenChange/SOGoMAPIFSFolder.m (-creationTime) diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m index 6e023c352..1659951e8 100644 --- a/OpenChange/MAPIStoreContext.m +++ b/OpenChange/MAPIStoreContext.m @@ -739,7 +739,8 @@ _prepareContextClass (struct mapistore_context *newMemCtx, notif_parameters->new_message_count = true; notif_parameters->message_count = [[folder messageKeys] count] + 1; } - mapistore_push_notification (MAPISTORE_FOLDER, + mapistore_push_notification (connInfo->mstore_ctx, + MAPISTORE_FOLDER, MAPISTORE_OBJECT_MODIFIED, notif_parameters); @@ -753,7 +754,8 @@ _prepareContextClass (struct mapistore_context *newMemCtx, notif_parameters->folder_id = folderId; notif_parameters->tag_count = 0xffff; - mapistore_push_notification (MAPISTORE_MESSAGE, + mapistore_push_notification (connInfo->mstore_ctx, + MAPISTORE_MESSAGE, MAPISTORE_OBJECT_CREATED, notif_parameters); talloc_free (notif_parameters); @@ -908,7 +910,7 @@ _prepareContextClass (struct mapistore_context *newMemCtx, asUnicodeInMemCtx: memCtx]; [self logWithFormat: @"found path '%s' for fmid %.16x", *path, fmid]; - rc = MAPISTORE_SUCCESS; + rc = MAPI_E_SUCCESS; } else { @@ -1176,7 +1178,8 @@ _prepareContextClass (struct mapistore_context *newMemCtx, notif_parameters->new_message_count = true; notif_parameters->message_count = [[folder messageKeys] count] - 1; - mapistore_push_notification (MAPISTORE_FOLDER, + mapistore_push_notification (connInfo->mstore_ctx, + MAPISTORE_FOLDER, MAPISTORE_OBJECT_MODIFIED, notif_parameters); talloc_free(notif_parameters); @@ -1188,7 +1191,8 @@ _prepareContextClass (struct mapistore_context *newMemCtx, notif_parameters->object_id = mid; notif_parameters->folder_id = fid; /* Exchange sends a fnevObjectCreated!! */ - mapistore_push_notification (MAPISTORE_MESSAGE, + mapistore_push_notification (connInfo->mstore_ctx, + MAPISTORE_MESSAGE, MAPISTORE_OBJECT_CREATED, notif_parameters); talloc_free(notif_parameters);