Merge in r3786-3788,3794-3795 from sogo branch

[jelmer/openchange-proposed.git/.git] / mapiproxy / servers / default / emsmdb / oxomsg.c

diff --git a/mapiproxy/servers/default/emsmdb/oxomsg.c b/mapiproxy/servers/default/emsmdb/oxomsg.c
index ef4eaa74916672520a07f1066d81de6fa604e9ae..9dcc7f0ef271ac13876ab79a48d1e322b27a7dff 100644 (file)
--- a/mapiproxy/servers/default/emsmdb/oxomsg.c
+++ b/mapiproxy/servers/default/emsmdb/oxomsg.c
@@ -31,9 +31,9 @@
 static void oxomsg_mapistore_handle_target_entryid(struct emsmdbp_context *emsmdbp_ctx, struct emsmdbp_object *old_message_object)
 {
        TALLOC_CTX                      *mem_ctx;
-       enum MAPITAGS                   property = PR_TARGET_ENTRYID;
+       enum MAPITAGS                   property = PidTagTargetEntryId;
        struct mapistore_property_data  property_data;
-       enum MAPITAGS                   ex_properties[] = { PR_TARGET_ENTRYID, PR_CHANGE_KEY, PR_PREDECESSOR_CHANGE_LIST };
+       enum MAPITAGS                   ex_properties[] = { PidTagTargetEntryId, PidTagChangeKey, PidTagPredecessorChangeList };
        struct SPropTagArray            excluded_tags = { sizeof(ex_properties) / sizeof(enum MAPITAGS), ex_properties };
        struct Binary_r                 *bin_data;
        struct MessageEntryId           *entryID;