GNOME.org
 

[evolution-mapi] Bump OpenChange dependency to 1.0

commit 1d8b29b4d63471883beacd1beca1e84d534f4587
Author: Milan Crha <mcrha redhat com>
Date:   Thu Mar 15 19:03:59 2012 +0100

    Bump OpenChange dependency to 1.0

 configure.ac                               |   50 +-
 src/libexchangemapi/Makefile.am            |    3 -
 src/libexchangemapi/e-mapi-connection.c    |   85 +--
 src/libexchangemapi/e-mapi-connection.h    |    1 +
 src/libexchangemapi/e-mapi-debug.c         |  610 -------------
 src/libexchangemapi/e-mapi-defs.h          |    7 -
 src/libexchangemapi/e-mapi-fast-transfer.c |   19 +-
 src/libexchangemapi/e-mapi-openchange.c    | 1331 ----------------------------
 src/libexchangemapi/e-mapi-openchange.h    |   53 --
 9 files changed, 15 insertions(+), 2144 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 46f23fa..adab539 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ dnl Required Packages
 dnl *******************
 m4_define([eds_minimum_version], [ema_version])
 m4_define([evo_minimum_version], [ema_version])
-m4_define([libmapi_minimum_version], [0.11])
+m4_define([libmapi_minimum_version], [1.0])
 m4_define([glib_minimum_version], [2.16.1])
 m4_define([gtk_minimum_version], [2.99.2])
 m4_define([gconf_minimum_version], [2.0.0])
@@ -135,40 +135,6 @@ AC_SUBST(LIBMAPI_CFLAGS)
 AC_SUBST(LIBMAPI_LIBS)
 
 dnl ****************************
-dnl Check for struct StringArrayW_r availability
-dnl ****************************
-AC_MSG_CHECKING([libmapi struct StringArrayW_r])
-save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
-save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
-AC_LINK_IFELSE([AC_LANG_PROGRAM(
-	[[#include <libmapi/libmapi.h>]],
-	[[struct StringArrayW_r str;]])],
-	[ac_cv_have_saw=yes],
-	[ac_cv_have_saw=no
-	 save_cflags="$save_cflags -DStringArrayW_r=WStringArray_r"
-	])
-CFLAGS=$save_cflags
-LIBS=$save_libs
-AC_MSG_RESULT([$ac_cv_have_saw])
-
-dnl ****************************
-dnl Check for struct mapi_SLPSTRArrayW availability
-dnl ****************************
-AC_MSG_CHECKING([libmapi struct mapi_SLPSTRArrayW])
-save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
-save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
-AC_LINK_IFELSE([AC_LANG_PROGRAM(
-	[[#include <libmapi/libmapi.h>]],
-	[[struct mapi_SLPSTRArrayW str;]])],
-	[ac_cv_have_msaw=yes],
-	[ac_cv_have_msaw=no
-	 save_cflags="$save_cflags -Dmapi_SLPSTRArrayW=mapi_SPLSTRArrayW"
-	])
-CFLAGS=$save_cflags
-LIBS=$save_libs
-AC_MSG_RESULT([$ac_cv_have_msaw])
-
-dnl ****************************
 dnl Check for struct mapi_SNotRestriction availability
 dnl see http://tracker.openchange.org/issues/377
 dnl ****************************
@@ -184,20 +150,6 @@ LIBS=$save_libs
 AC_MSG_RESULT([$ac_cv_have_rns])
 
 dnl ****************************
-dnl Check for nspi_GetMatches with ulResult availability
-dnl ****************************
-AC_MSG_CHECKING([libmapi nspi_GetMatches with ulResult parameter])
-save_cflags=$CFLAGS; CFLAGS=$LIBMAPI_CFLAGS
-save_libs=$LIBS; LIBS="$LIBMAPI_LIBS"
-AC_LINK_IFELSE([AC_LANG_PROGRAM(
-	[[#include <libmapi/libmapi.h>]],
-	[[nspi_GetMatches (NULL, NULL, NULL, NULL, 5000, NULL, NULL);]])],
-	[AC_DEFINE(HAVE_NSPI_GETMATCHES_ULRESULT, 1, [libmapi supports nspi_GetMatches with ulResult parameter]) ac_cv_have_ngmr=yes],[ac_cv_have_ngmr=no])
-CFLAGS=$save_cflags
-LIBS=$save_libs
-AC_MSG_RESULT([$ac_cv_have_ngmr])
-
-dnl ****************************
 dnl Expose version information
 dnl ****************************
 API_VERSION=$EDS_PACKAGE
diff --git a/src/libexchangemapi/Makefile.am b/src/libexchangemapi/Makefile.am
index ddeaa82..4786f8c 100644
--- a/src/libexchangemapi/Makefile.am
+++ b/src/libexchangemapi/Makefile.am
@@ -22,8 +22,6 @@ libexchangemapi_1_0_la_SOURCES =	\
 	camel-mapi-settings.h		\
 	e-mapi-fast-transfer.h		\
 	e-mapi-fast-transfer.c		\
-	e-mapi-openchange.h		\
-	e-mapi-openchange.c		\
 	e-mapi-defs.h			\
 	e-mapi-folder.c			\
 	e-mapi-folder.h			\
@@ -71,7 +69,6 @@ libexchangemapiinclude_HEADERS = 	\
 	e-mapi-cal-tz-utils.h		\
 	e-mapi-cal-recur-utils.h	\
 	e-mapi-mail-utils.h		\
-	e-mapi-openchange.h		\
 	e-mapi-operation-queue.h
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c
index 0be42da..0cda118 100644
--- a/src/libexchangemapi/e-mapi-connection.c
+++ b/src/libexchangemapi/e-mapi-connection.c
@@ -41,7 +41,6 @@
 #include "e-mapi-book-utils.h"
 #include "e-mapi-mail-utils.h"
 #include "e-mapi-fast-transfer.h"
-#include "e-mapi-openchange.h"
 
 /* how many bytes can be written within one property with SetProps() call;
    if its size exceeds this limit, it's converted into an EMapiStreamedProp */
@@ -2544,10 +2543,10 @@ e_mapi_connection_fetch_object_internal (EMapiConnection *conn,
 					guid = GUID_string (mem_ctx, &(np_nameid[ui16].lpguid));
 
 					if (np_nameid[ui16].ulKind == MNID_ID) {
-						if (e_mapi_nameid_lid_lookup_canonical (np_nameid[ui16].kind.lid, guid, &lid) != MAPI_E_SUCCESS)
+						if (mapi_nameid_lid_lookup_canonical (np_nameid[ui16].kind.lid, guid, &lid) != MAPI_E_SUCCESS)
 							lid = MAPI_E_RESERVED;
 					} else if (np_nameid[ui16].ulKind == MNID_STRING) {
-						if (e_mapi_nameid_string_lookup_canonical (np_nameid[ui16].kind.lpwstr.Name, guid, &lid) != MAPI_E_SUCCESS)
+						if (mapi_nameid_string_lookup_canonical (np_nameid[ui16].kind.lpwstr.Name, guid, &lid) != MAPI_E_SUCCESS)
 							lid = MAPI_E_RESERVED;
 					}
 
@@ -4388,11 +4387,7 @@ e_mapi_connection_list_gal_objects (EMapiConnection *conn,
 		}
 	}
 
-	ms = nspi_GetMatches (priv->session->nspi->ctx, mem_ctx, propTagArray, use_restriction,
-		#ifdef HAVE_NSPI_GETMATCHES_ULRESULT
-		(uint32_t) -1,
-		#endif
-		&rows, &pMIds);
+	ms = nspi_GetMatches (priv->session->nspi->ctx, mem_ctx, propTagArray, use_restriction, (uint32_t) -1, &rows, &pMIds);
 	if (ms != MAPI_E_SUCCESS || !rows) {
 		if (ms == MAPI_E_NOT_FOUND || (!rows && ms == MAPI_E_SUCCESS))
 			ms = MAPI_E_SUCCESS;
@@ -6306,11 +6301,7 @@ e_mapi_connection_enable_notifications (EMapiConnection *conn,
 	}
 
 	if (priv->register_notification_result == MAPI_E_RESERVED)
-		priv->register_notification_result = RegisterNotification (priv->session, fnevNewMail |
-			     fnevObjectCreated |
-			     fnevObjectDeleted |
-			     fnevObjectModified |
-			     fnevObjectMoved);
+		priv->register_notification_result = RegisterNotification (priv->session);
 
 	if (priv->register_notification_result != MAPI_E_SUCCESS) {
 		make_mapi_error (perror, "RegisterNotification", priv->register_notification_result);
@@ -6403,71 +6394,6 @@ e_mapi_connection_disable_notifications	(EMapiConnection *conn,
 
 /* profile related functions - begin */
 
-extern const struct ndr_interface_table ndr_table_exchange_ds_rfr; /* from openchange's ndr_exchange.h */
-
-static enum MAPISTATUS
-test_server_availability (struct mapi_context *mapi_ctx,
-			  const gchar *profname,
-			  const gchar *password,
-			  GCancellable *cancellable,
-			  GError **perror)
-{
-	enum MAPISTATUS	ms = MAPI_E_LOGON_FAILED;
-	TALLOC_CTX *mem_ctx;
-	struct mapi_profile *profile;
-	gchar *binding_str;
-	struct dcerpc_pipe *pipe;
-	struct tevent_context	*ev;
-	NTSTATUS status;
-
-	mem_ctx = talloc_new (mapi_ctx->mem_ctx);
-	profile = talloc_zero (mem_ctx, struct mapi_profile);
-	if (!profile) {
-		talloc_free (mem_ctx);
-		return MAPI_E_NOT_ENOUGH_RESOURCES;
-	}
-
-	ms = OpenProfile (mapi_ctx, profile, profname, password);
-	if (ms != MAPI_E_SUCCESS)
-		goto cleanup;
-
-	ms = LoadProfile (mapi_ctx, profile);
-	if (ms != MAPI_E_SUCCESS)
-		goto cleanup;
-
-	binding_str = talloc_asprintf (mem_ctx, "ncacn_ip_tcp:%s[", profile->server);
-
-	/* If seal option is enabled in the profile */
-	if (profile->seal != 0) {
-		binding_str = talloc_strdup_append (binding_str, "seal,");
-	}
-
-	/* If localaddress parameter is available in the profile */
-	if (profile->localaddr) {
-		binding_str = talloc_asprintf_append (binding_str, "localaddress=%s,", profile->localaddr);
-	}
-
-	binding_str = talloc_strdup_append (binding_str, "]");
-	ev = tevent_context_init (mem_ctx);
-
-	status = dcerpc_pipe_connect (mem_ctx, &pipe, binding_str, &ndr_table_exchange_ds_rfr, profile->credentials, ev, mapi_ctx->lp_ctx); 
-
-	if (!NT_STATUS_IS_OK (status))
-		e_mapi_debug_print ("%s: Failed to connect to remote server: %s %s\n", G_STRFUNC, binding_str, nt_errstr (status));
-
-	if (NT_STATUS_EQUAL (status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
-		ms = MAPI_E_NETWORK_ERROR;
-		g_set_error (perror, E_MAPI_ERROR, ms, _("Server '%s' is not reachable"), profile->server);
-	}
-
-	talloc_free (binding_str);
-
- cleanup:
-	talloc_free (mem_ctx);
-
-	return ms;
-}
-
 struct tcp_data
 {
 	struct mapi_context *mapi_ctx;
@@ -6597,9 +6523,6 @@ mapi_profile_load (struct mapi_context *mapi_ctx, const gchar *profname, const g
 	if (ms == MAPI_E_NOT_FOUND && try_create_profile (mapi_ctx, profname, password, cancellable, perror))
 		ms = MapiLogonEx (mapi_ctx, &session, profname, password);
 
-	if (ms == MAPI_E_LOGON_FAILED)
-		ms = test_server_availability (mapi_ctx, profname, password, cancellable, perror);
-
 	if (ms != MAPI_E_SUCCESS) {
 		make_mapi_error (perror, "MapiLogonEx", ms);
 		goto cleanup;
diff --git a/src/libexchangemapi/e-mapi-connection.h b/src/libexchangemapi/e-mapi-connection.h
index 8889c55..186c8a6 100644
--- a/src/libexchangemapi/e-mapi-connection.h
+++ b/src/libexchangemapi/e-mapi-connection.h
@@ -30,6 +30,7 @@
 #include <gio/gio.h>
 
 #include <libmapi/libmapi.h>
+#include <libmapi/mapi_nameid.h>
 
 /* Standard GObject macros */
 #define E_MAPI_TYPE_CONNECTION (e_mapi_connection_get_type ())
diff --git a/src/libexchangemapi/e-mapi-debug.c b/src/libexchangemapi/e-mapi-debug.c
index 70349f9..26e739b 100644
--- a/src/libexchangemapi/e-mapi-debug.c
+++ b/src/libexchangemapi/e-mapi-debug.c
@@ -111,616 +111,6 @@ e_mapi_debug_dump_bin (const uint8_t *bin,
 	}
 }
 
-static const gchar *
-get_namedid_name (uint32_t proptag)
-{
-	static GHashTable *names = NULL;
-
-	if (proptag == MAPI_E_RESERVED)
-		return NULL;
-
-	if (!names) {
-		struct _array {
-			uint32_t proptag;
-			const gchar *name;
-		} array[] = {
-			#define cs(x) { x, #x } ,
-			cs (PidLidAddressBookProviderArrayType)
-			cs (PidLidAddressBookProviderEmailList)
-			cs (PidLidAddressCountryCode)
-			cs (PidLidAnniversaryEventEntryId)
-			cs (PidLidAutoLog)
-			cs (PidLidBirthdayEventEntryId)
-			cs (PidLidBirthdayLocal)
-			cs (PidLidBusinessCardCardPicture)
-			cs (PidLidBusinessCardDisplayDefinition)
-			cs (PidLidContactCharacterSet)
-			cs (PidLidContactItemData)
-			cs (PidLidContactUserField1)
-			cs (PidLidContactUserField2)
-			cs (PidLidContactUserField3)
-			cs (PidLidContactUserField4)
-			cs (PidLidDepartment)
-			cs (PidLidDistributionListChecksum)
-			cs (PidLidDistributionListMembers)
-			cs (PidLidDistributionListName)
-			cs (PidLidDistributionListOneOffMembers)
-			cs (PidLidDistributionListStream)
-			cs (PidLidEmail1AddressType)
-			cs (PidLidEmail1DisplayName)
-			cs (PidLidEmail1EmailAddress)
-			cs (PidLidEmail1OriginalDisplayName)
-			cs (PidLidEmail1OriginalEntryId)
-			cs (PidLidEmail1RichTextFormat)
-			cs (PidLidEmail2AddressType)
-			cs (PidLidEmail2DisplayName)
-			cs (PidLidEmail2EmailAddress)
-			cs (PidLidEmail2OriginalDisplayName)
-			cs (PidLidEmail2OriginalEntryId)
-			cs (PidLidEmail2RichTextFormat)
-			cs (PidLidEmail3AddressType)
-			cs (PidLidEmail3DisplayName)
-			cs (PidLidEmail3EmailAddress)
-			cs (PidLidEmail3OriginalDisplayName)
-			cs (PidLidEmail3OriginalEntryId)
-			cs (PidLidEmail3RichTextFormat)
-			cs (PidLidEmailList)
-			cs (PidLidFax1AddressType)
-			cs (PidLidFax1EmailAddress)
-			cs (PidLidFax1OriginalDisplayName)
-			cs (PidLidFax1OriginalEntryId)
-			cs (PidLidFax2AddressType)
-			cs (PidLidFax2EmailAddress)
-			cs (PidLidFax2OriginalDisplayName)
-			cs (PidLidFax2OriginalEntryId)
-			cs (PidLidFax3AddressType)
-			cs (PidLidFax3EmailAddress)
-			cs (PidLidFax3OriginalDisplayName)
-			cs (PidLidFax3OriginalEntryId)
-			cs (PidLidFileUnder)
-			cs (PidLidFileUnderId)
-			cs (PidLidFileUnderList)
-			cs (PidLidFreeBusyLocation)
-			cs (PidLidHasPicture)
-			cs (PidLidHomeAddress)
-			cs (PidLidHomeAddressCountryCode)
-			cs (PidLidHtml)
-			cs (PidLidInstantMessagingAddress)
-			cs (PidLidOtherAddress)
-			cs (PidLidOtherAddressCountryCode)
-			cs (PidLidPostalAddressId)
-			cs (PidLidReferredBy)
-			cs (PidLidWeddingAnniversaryLocal)
-			cs (PidLidWorkAddress)
-			cs (PidLidWorkAddressCity)
-			cs (PidLidWorkAddressCountry)
-			cs (PidLidWorkAddressCountryCode)
-			cs (PidLidWorkAddressPostalCode)
-			cs (PidLidWorkAddressPostOfficeBox)
-			cs (PidLidWorkAddressState)
-			cs (PidLidYomiCompanyName)
-			cs (PidLidYomiFirstName)
-			cs (PidLidYomiLastName)
-			cs (PidLidAllAttendeesString)
-			cs (PidLidAllowExternalCheck)
-			cs (PidLidAppointmentAuxiliaryFlags)
-			cs (PidLidAppointmentColor)
-			cs (PidLidAppointmentCounterProposal)
-			cs (PidLidAppointmentDuration)
-			cs (PidLidAppointmentEndDate)
-			cs (PidLidAppointmentEndTime)
-			cs (PidLidAppointmentEndWhole)
-			cs (PidLidAppointmentLastSequence)
-			cs (PidLidAppointmentNotAllowPropose)
-			cs (PidLidAppointmentProposalNumber)
-			cs (PidLidAppointmentProposedDuration)
-			cs (PidLidAppointmentProposedEndWhole)
-			cs (PidLidAppointmentProposedStartWhole)
-			cs (PidLidAppointmentRecur)
-			cs (PidLidAppointmentReplyName)
-			cs (PidLidAppointmentReplyTime)
-			cs (PidLidAppointmentSequence)
-			cs (PidLidAppointmentSequenceTime)
-			cs (PidLidAppointmentStartDate)
-			cs (PidLidAppointmentStartTime)
-			cs (PidLidAppointmentStartWhole)
-			cs (PidLidAppointmentStateFlags)
-			cs (PidLidAppointmentSubType)
-			cs (PidLidAppointmentTimeZoneDefinitionEndDisplay)
-			cs (PidLidAppointmentTimeZoneDefinitionRecur)
-			cs (PidLidAppointmentTimeZoneDefinitionStartDisplay)
-			cs (PidLidAppointmentUnsendableRecipients)
-			cs (PidLidAppointmentUpdateTime)
-			cs (PidLidAutoFillLocation)
-			cs (PidLidAutoStartCheck)
-			cs (PidLidBusyStatus)
-			cs (PidLidCcAttendeesString)
-			cs (PidLidChangeHighlight)
-			cs (PidLidClipEnd)
-			cs (PidLidClipStart)
-			cs (PidLidCollaborateDoc)
-			cs (PidLidConferencingCheck)
-			cs (PidLidConferencingType)
-			cs (PidLidDirectory)
-			cs (PidLidExceptionReplaceTime)
-			cs (PidLidFExceptionalAttendees)
-			cs (PidLidFExceptionalBody)
-			cs (PidLidFInvited)
-			cs (PidLidForwardInstance)
-			cs (PidLidForwardNotificationRecipients)
-			cs (PidLidFOthersAppointment)
-			cs (PidLidInboundICalStream)
-			cs (PidLidIntendedBusyStatus)
-			cs (PidLidLinkedTaskItems)
-			cs (PidLidLocation)
-			cs (PidLidMeetingWorkspaceUrl)
-			cs (PidLidNetShowUrl)
-			cs (PidLidOnlinePassword)
-			cs (PidLidOrganizerAlias)
-			cs (PidLidOriginalStoreEntryId)
-			cs (PidLidOwnerName)
-			cs (PidLidRecurrencePattern)
-			cs (PidLidRecurrenceType)
-			cs (PidLidRecurring)
-			cs (PidLidResponseStatus)
-			cs (PidLidSingleBodyICal)
-			cs (PidLidTimeZoneDescription)
-			cs (PidLidTimeZoneStruct)
-			cs (PidLidToAttendeesString)
-			cs (PidLidClientIntent)
-			cs (PidLidServerProcessed)
-			cs (PidLidServerProcessingActions)
-			cs (PidLidAgingDontAgeMe)
-			cs (PidLidAutoProcessState)
-			cs (PidLidBilling)
-			cs (PidLidClassification)
-			cs (PidLidClassificationDescription)
-			cs (PidLidClassificationGuid)
-			cs (PidLidClassificationKeep)
-			cs (PidLidClassified)
-			cs (PidLidCommonEnd)
-			cs (PidLidCommonStart)
-			cs (PidLidCompanies)
-			cs (PidLidContactLinkEntry)
-			cs (PidLidContactLinkName)
-			cs (PidLidContactLinkSearchKey)
-			cs (PidLidContacts)
-			cs (PidLidConversationActionLastAppliedTime)
-			cs (PidLidConversationActionMaxDeliveryTime)
-			cs (PidLidConversationActionMoveFolderEid)
-			cs (PidLidConversationActionMoveStoreEid)
-			cs (PidLidConversationActionVersion)
-			cs (PidLidConversationProcessed)
-			cs (PidLidCurrentVersion)
-			cs (PidLidCurrentVersionName)
-			cs (PidLidDayOfMonth)
-			cs (PidLidFlagRequest)
-			cs (PidLidFlagString)
-			cs (PidLidICalendarDayOfWeekMask)
-			cs (PidLidInfoPathFormName)
-			cs (PidLidInternetAccountName)
-			cs (PidLidInternetAccountStamp)
-			cs (PidLidMonthOfYear)
-			cs (PidLidNoEndDateFlag)
-			cs (PidLidNonSendableBcc)
-			cs (PidLidNonSendableCc)
-			cs (PidLidNonSendableTo)
-			cs (PidLidNonSendBccTrackStatus)
-			cs (PidLidNonSendCcTrackStatus)
-			cs (PidLidNonSendToTrackStatus)
-			cs (PidLidOccurrences)
-			cs (PidLidPrivate)
-			cs (PidLidPromptSendUpdate)
-			cs (PidLidRecurrenceDuration)
-			cs (PidLidReferenceEntryId)
-			cs (PidLidReminderDelta)
-			cs (PidLidReminderFileParameter)
-			cs (PidLidReminderOverride)
-			cs (PidLidReminderPlaySound)
-			cs (PidLidReminderSet)
-			cs (PidLidReminderSignalTime)
-			cs (PidLidReminderTime)
-			cs (PidLidReminderTimeDate)
-			cs (PidLidReminderTimeTime)
-			cs (PidLidReminderType)
-			cs (PidLidRemoteStatus)
-			cs (PidLidSideEffects)
-			cs (PidLidSmartNoAttach)
-			cs (PidLidSpamOriginalFolder)
-			cs (PidLidTaskGlobalId)
-			cs (PidLidTaskMode)
-			cs (PidLidToDoOrdinalDate)
-			cs (PidLidToDoSubOrdinal)
-			cs (PidLidToDoTitle)
-			cs (PidLidUseTnef)
-			cs (PidLidValidFlagStringProof)
-			cs (PidLidVerbResponse)
-			cs (PidLidVerbStream)
-			cs (PidLidLogDocumentPosted)
-			cs (PidLidLogDocumentPrinted)
-			cs (PidLidLogDocumentRouted)
-			cs (PidLidLogDocumentSaved)
-			cs (PidLidLogDuration)
-			cs (PidLidLogEnd)
-			cs (PidLidLogFlags)
-			cs (PidLidLogStart)
-			cs (PidLidLogType)
-			cs (PidLidLogTypeDesc)
-			cs (PidLidAppointmentMessageClass)
-			cs (PidLidAttendeeCriticalChange)
-			cs (PidLidCalendarType)
-			cs (PidLidCleanGlobalObjectId)
-			cs (PidLidDayInterval)
-			cs (PidLidDelegateMail)
-			cs (PidLidEndRecurrenceDate)
-			cs (PidLidEndRecurrenceTime)
-			cs (PidLidGlobalObjectId)
-			cs (PidLidIsException)
-			cs (PidLidIsRecurring)
-			cs (PidLidIsSilent)
-			cs (PidLidMeetingType)
-			cs (PidLidMonthInterval)
-			cs (PidLidMonthOfYearMask)
-			cs (PidLidOldLocation)
-			cs (PidLidOldRecurrenceType)
-			cs (PidLidOldWhenEndWhole)
-			cs (PidLidOldWhenStartWhole)
-			cs (PidLidOptionalAttendees)
-			cs (PidLidOwnerCriticalChange)
-			cs (PidLidRequiredAttendees)
-			cs (PidLidResourceAttendees)
-			cs (PidLidStartRecurrenceDate)
-			cs (PidLidStartRecurrenceTime)
-			cs (PidLidTimeZone)
-			cs (PidLidWeekInterval)
-			cs (PidLidWhere)
-			cs (PidLidYearInterval)
-			cs (PidLidNoteColor)
-			cs (PidLidNoteHeight)
-			cs (PidLidNoteWidth)
-			cs (PidLidNoteX)
-			cs (PidLidNoteY)
-			cs (PidLidPostRssChannel)
-			cs (PidLidPostRssChannelLink)
-			cs (PidLidPostRssItemGuid)
-			cs (PidLidPostRssItemHash)
-			cs (PidLidPostRssItemLink)
-			cs (PidLidPostRssItemXml)
-			cs (PidLidPostRssSubscription)
-			cs (PidLidSharingAnonymity)
-			cs (PidLidSharingBindingEntryId)
-			cs (PidLidSharingBrowseUrl)
-			cs (PidLidSharingCapabilities)
-			cs (PidLidSharingConfigurationUrl)
-			cs (PidLidSharingDataRangeEnd)
-			cs (PidLidSharingDataRangeStart)
-			cs (PidLidSharingDetail)
-			cs (PidLidSharingExtensionXml)
-			cs (PidLidSharingFilter)
-			cs (PidLidSharingFlags)
-			cs (PidLidSharingFlavor)
-			cs (PidLidSharingFolderEntryId)
-			cs (PidLidSharingIndexEntryId)
-			cs (PidLidSharingInitiatorEntryId)
-			cs (PidLidSharingInitiatorName)
-			cs (PidLidSharingInitiatorSmtp)
-			cs (PidLidSharingInstanceGuid)
-			cs (PidLidSharingLastAutoSyncTime)
-			cs (PidLidSharingLastSyncTime)
-			cs (PidLidSharingLocalComment)
-			cs (PidLidSharingLocalLastModificationTime)
-			cs (PidLidSharingLocalName)
-			cs (PidLidSharingLocalPath)
-			cs (PidLidSharingLocalStoreUid)
-			cs (PidLidSharingLocalType)
-			cs (PidLidSharingLocalUid)
-			cs (PidLidSharingOriginalMessageEntryId)
-			cs (PidLidSharingParentBindingEntryId)
-			cs (PidLidSharingParticipants)
-			cs (PidLidSharingPermissions)
-			cs (PidLidSharingProviderExtension)
-			cs (PidLidSharingProviderGuid)
-			cs (PidLidSharingProviderName)
-			cs (PidLidSharingProviderUrl)
-			cs (PidLidSharingRangeEnd)
-			cs (PidLidSharingRangeStart)
-			cs (PidLidSharingReciprocation)
-			cs (PidLidSharingRemoteByteSize)
-			cs (PidLidSharingRemoteComment)
-			cs (PidLidSharingRemoteCrc)
-			cs (PidLidSharingRemoteLastModificationTime)
-			cs (PidLidSharingRemoteMessageCount)
-			cs (PidLidSharingRemoteName)
-			cs (PidLidSharingRemotePass)
-			cs (PidLidSharingRemotePath)
-			cs (PidLidSharingRemoteStoreUid)
-			cs (PidLidSharingRemoteType)
-			cs (PidLidSharingRemoteUid)
-			cs (PidLidSharingRemoteUser)
-			cs (PidLidSharingRemoteVersion)
-			cs (PidLidSharingResponseTime)
-			cs (PidLidSharingResponseType)
-			cs (PidLidSharingRoamLog)
-			cs (PidLidSharingStart)
-			cs (PidLidSharingStatus)
-			cs (PidLidSharingStop)
-			cs (PidLidSharingSyncFlags)
-			cs (PidLidSharingSyncInterval)
-			cs (PidLidSharingTimeToLive)
-			cs (PidLidSharingTimeToLiveAuto)
-			cs (PidLidSharingWorkingHoursDays)
-			cs (PidLidSharingWorkingHoursEnd)
-			cs (PidLidSharingWorkingHoursStart)
-			cs (PidLidSharingWorkingHoursTimeZone)
-			cs (PidLidPercentComplete)
-			cs (PidLidTaskAcceptanceState)
-			cs (PidLidTaskAccepted)
-			cs (PidLidTaskActualEffort)
-			cs (PidLidTaskAssigner)
-			cs (PidLidTaskAssigners)
-			cs (PidLidTaskComplete)
-			cs (PidLidTaskCustomFlags)
-			cs (PidLidTaskDateCompleted)
-			cs (PidLidTaskDeadOccurrence)
-			cs (PidLidTaskDueDate)
-			cs (PidLidTaskEstimatedEffort)
-			cs (PidLidTaskFCreator)
-			cs (PidLidTaskFFixOffline)
-			cs (PidLidTaskFRecurring)
-			cs (PidLidTaskHistory)
-			cs (PidLidTaskLastDelegate)
-			cs (PidLidTaskLastUpdate)
-			cs (PidLidTaskLastUser)
-			cs (PidLidTaskMultipleRecipients)
-			cs (PidLidTaskNoCompute)
-			cs (PidLidTaskOrdinal)
-			cs (PidLidTaskOwner)
-			cs (PidLidTaskOwnership)
-			cs (PidLidTaskRecurrence)
-			cs (PidLidTaskResetReminder)
-			cs (PidLidTaskRole)
-			cs (PidLidTaskStartDate)
-			cs (PidLidTaskState)
-			cs (PidLidTaskStatus)
-			cs (PidLidTaskStatusOnComplete)
-			cs (PidLidTaskUpdates)
-			cs (PidLidTaskVersion)
-			cs (PidLidTeamTask)
-			cs (PidLidTrustRecipientHighlights)
-			cs (PidLidCategories)
-			cs (PidNameInstantMessagingAddress2)
-			cs (PidNameInstantMessagingAddress3)
-			cs (PidNameAttachmentMacContentType)
-			cs (PidNameAttachmentMacInfo)
-			cs (PidNameOriginalSpamConfidenceLevel)
-			cs (PidNameAudioNotes)
-			cs (PidNameAutomaticSpeechRecognitionData)
-			cs (PidNameOutlookProtectionRuleTimestamp)
-			cs (PidNameXUnifiedMessagingPartnerAssignedId)
-			cs (PidNameXUnifiedMessagingPartnerContent)
-			cs (PidNameXUnifiedMessagingPartnerContext)
-			cs (PidNameXUnifiedMessagingPartnerStatus)
-			cs (PidNameAcceptLanguage)
-			cs (PidNameApprovalAllowedDecisionMakers)
-			cs (PidNameApprovalRequestor)
-			cs (PidNameApproved)
-			cs (PidNameAuthenticatedAs)
-			cs (PidNameAuthenticatedDomain)
-			cs (PidNameAuthenticatedMechanism)
-			cs (PidNameAuthenticatedSource)
-			cs (PidNameBcc)
-			cs (PidNameCc)
-			cs (PidNameContentBase)
-			cs (PidNameContentClass)
-			cs (PidNameContentDisposition)
-			cs (PidNameContentID)
-			cs (PidNameContentLanguage)
-			cs (PidNameContentLocation)
-			cs (PidNameContentTransferEncoding)
-			cs (PidNameContentType)
-			cs (PidNameControl)
-			cs (PidNameCrossReference)
-			cs (PidNameDisposition)
-			cs (PidNameDispositionNotificationTo)
-			cs (PidNameDistribution)
-			cs (PidNameExpires)
-			cs (PidNameExpiryDate)
-			cs (PidNameFollowupTo)
-			cs (PidNameFrom)
-			cs (PidNameImportance)
-			cs (PidNameInReplyTo)
-			cs (PidNameInternetComment)
-			cs (PidNameInternetKeywords)
-			cs (PidNameInternetSubject)
-			cs (PidNameLines)
-			cs (PidNameMessageId)
-			cs (PidNameMimeVersion)
-			cs (PidNameNewsgroups)
-			cs (PidNameNntpPostingHost)
-			cs (PidNameOrganization)
-			cs (PidNameOriginalRecipient)
-			cs (PidNameOutlookProtectionRuleOverridden)
-			cs (PidNameOutlookProtectionRuleVersion)
-			cs (PidNamePath)
-			cs (PidNamePostingVersion)
-			cs (PidNamePriority)
-			cs (PidNameReceived)
-			cs (PidNameReferences)
-			cs (PidNameRelayVersion)
-			cs (PidNameReplyBy)
-			cs (PidNameReplyTo)
-			cs (PidNameReturnPath)
-			cs (PidNameReturnReceiptTo)
-			cs (PidNameRightsProtectMessage)
-			cs (PidNameSender)
-			cs (PidNameSensitivity)
-			cs (PidNameSummary)
-			cs (PidNameThreadIndex)
-			cs (PidNameThreadTopic)
-			cs (PidNameTo)
-			cs (PidNameXCallId)
-			cs (PidNameXFaxNumberOfPages)
-			cs (PidNameXMailer)
-			cs (PidNameXMessageCompleted)
-			cs (PidNameXMessageFlag)
-			cs (PidNameXRequireProtectedPlayOnPhone)
-			cs (PidNameXSenderTelephoneNumber)
-			cs (PidNameXSharingBrowseUrl)
-			cs (PidNameXSharingCapabilities)
-			cs (PidNameXSharingConfigUrl)
-			cs (PidNameXSharingExendedCaps)
-			cs (PidNameXSharingFlavor)
-			cs (PidNameXSharingInstanceGuid)
-			cs (PidNameXSharingLocalType)
-			cs (PidNameXSharingProviderGuid)
-			cs (PidNameXSharingProviderName)
-			cs (PidNameXSharingProviderUrl)
-			cs (PidNameXSharingRemoteName)
-			cs (PidNameXSharingRemotePath)
-			cs (PidNameXSharingRemoteStoreUid)
-			cs (PidNameXSharingRemoteType)
-			cs (PidNameXSharingRemoteUid)
-			cs (PidNameXUnsent)
-			cs (PidNameXVoiceMessageAttachmentOrder)
-			cs (PidNameXVoiceMessageDuration)
-			cs (PidNameXVoiceMessageSenderName)
-			cs (PidNameApplicationName)
-			cs (PidNameAuthor)
-			cs (PidNameByteCount)
-			cs (PidNameCalendarAttendeeRole)
-			cs (PidNameCalendarBusystatus)
-			cs (PidNameCalendarContact)
-			cs (PidNameCalendarContactUrl)
-			cs (PidNameCalendarCreated)
-			cs (PidNameCalendarDescriptionUrl)
-			cs (PidNameCalendarDuration)
-			cs (PidNameCalendarExceptionDate)
-			cs (PidNameCalendarExceptionRule)
-			cs (PidNameCalendarGeoLatitude)
-			cs (PidNameCalendarGeoLongitude)
-			cs (PidNameCalendarInstanceType)
-			cs (PidNameCalendarIsOrganizer)
-			cs (PidNameCalendarLastModified)
-			cs (PidNameCalendarLocationUrl)
-			cs (PidNameCalendarMeetingStatus)
-			cs (PidNameCalendarMethod)
-			cs (PidNameCalendarProductId)
-			cs (PidNameCalendarRecurrenceIdRange)
-			cs (PidNameCalendarReminderOffset)
-			cs (PidNameCalendarResources)
-			cs (PidNameCalendarRsvp)
-			cs (PidNameCalendarSequence)
-			cs (PidNameCalendarTimeZone)
-			cs (PidNameCalendarTimeZoneId)
-			cs (PidNameCalendarTransparent)
-			cs (PidNameCalendarUid)
-			cs (PidNameCalendarVersion)
-			cs (PidNameCategory)
-			cs (PidNameCharacterCount)
-			cs (PidNameComments)
-			cs (PidNameCompany)
-			cs (PidNameContactsAlternateRecipient)
-			cs (PidNameContactsCountry)
-			cs (PidNameContactsEmail1)
-			cs (PidNameContactsEmail2)
-			cs (PidNameContactsEmail3)
-			cs (PidNameContactsFileAs)
-			cs (PidNameContactsFileasId)
-			cs (PidNameContactsHomeLatitude)
-			cs (PidNameContactsHomeLongitude)
-			cs (PidNameContactsHomeTimeZone)
-			cs (PidNameContactsMapUrl)
-			cs (PidNameContactsOtherCountryCode)
-			cs (PidNameContactsOtherPager)
-			cs (PidNameContactsOtherTimeZone)
-			cs (PidNameContactsProxyAddresses)
-			cs (PidNameContactsSecretaryUrl)
-			cs (PidNameContactsSourceUrl)
-			cs (PidNameCreateDateTimeReadOnly)
-			cs (PidNameDavGetContentType)
-			cs (PidNameDavId)
-			cs (PidNameDavIsCollection)
-			cs (PidNameDavIsStructuredDocument)
-			cs (PidNameDavParentName)
-			cs (PidNameDavResourceType)
-			cs (PidNameDavSearchRequest)
-			cs (PidNameDavSearchType)
-			cs (PidNameDavUid)
-			cs (PidNameDocumentParts)
-			cs (PidNameEditTime)
-			cs (PidNameExchangeIntendedBusyStatus)
-			cs (PidNameExchangeJunkEmailMoveStamp)
-			cs (PidNameExchangeModifyExceptionStructure)
-			cs (PidNameExchangeNoModifyExceptions)
-			cs (PidNameExchangePatternEnd)
-			cs (PidNameExchangePatternStart)
-			cs (PidNameExchangePublicFolderEmailAddress)
-			cs (PidNameExchangeReminderInterval)
-			cs (PidNameExchDatabaseSchema)
-			cs (PidNameExchDataExpectedContentClass)
-			cs (PidNameExchDataSchemaCollectionReference)
-			cs (PidNameHeadingPairs)
-			cs (PidNameHiddenCount)
-			cs (PidNameHttpmailCalendar)
-			cs (PidNameHttpmailCc)
-			cs (PidNameHttpmailContacts)
-			cs (PidNameHttpmailContentMediaType)
-			cs (PidNameHttpmailFrom)
-			cs (PidNameHttpmailFromEmail)
-			cs (PidNameHttpmailHtmlDescription)
-			cs (PidNameHttpmailOutbox)
-			cs (PidNameHttpmailSendMessage)
-			cs (PidNameHttpmailSubmitted)
-			cs (PidNameHttpmailTo)
-			cs (PidNameICalendarRecurrenceDate)
-			cs (PidNameICalendarRecurrenceRule)
-			cs (PidNameKeywords)
-			cs (PidNameLastAuthor)
-			cs (PidNameLastPrinted)
-			cs (PidNameLastSaveDateTime)
-			cs (PidNameLineCount)
-			cs (PidNameLinksDirty)
-			cs (PidNameMailSubmissionUri)
-			cs (PidNameManager)
-			cs (PidNameMultimediaClipCount)
-			cs (PidNameNoteCount)
-			cs (PidNameOMSAccountGuid)
-			cs (PidNameOMSMobileModel)
-			cs (PidNameOMSScheduleTime)
-			cs (PidNameOMSServiceType)
-			cs (PidNameOMSSourceType)
-			cs (PidNamePageCount)
-			cs (PidNameParagraphCount)
-			cs (PidNamePhishingStamp)
-			cs (PidNamePresentationFormat)
-			cs (PidNameQuarantineOriginalSender)
-			cs (PidNameRevisionNumber)
-			cs (PidNameRightsManagementLicense)
-			cs (PidNameScale)
-			cs (PidNameSecurity)
-			cs (PidNameSlideCount)
-			cs (PidNameSubject)
-			cs (PidNameTemplate)
-			cs (PidNameThumbnail)
-			cs (PidNameTitle)
-			cs (PidNameWordCount)
-			#undef cs
-			{ 0, NULL }
-		};
-		gint ii;
-
-		names = g_hash_table_new (g_direct_hash, g_direct_equal);
-		for (ii = 0; array[ii].proptag; ii++) {
-			gpointer name = (gpointer) array[ii].name;
-
-			g_hash_table_insert (names, GUINT_TO_POINTER (array[ii].proptag), name);
-			g_hash_table_insert (names, GUINT_TO_POINTER ((array[ii].proptag & ~0xFFFF) | PT_ERROR), name);
-		}
-	}
-
-	return g_hash_table_lookup (names, GUINT_TO_POINTER (proptag));
-}
-
 void
 e_mapi_debug_dump_properties (struct mapi_SPropValue_array *properties,
 			      gint indent)
diff --git a/src/libexchangemapi/e-mapi-defs.h b/src/libexchangemapi/e-mapi-defs.h
index 78f1f45..5eeb505 100644
--- a/src/libexchangemapi/e-mapi-defs.h
+++ b/src/libexchangemapi/e-mapi-defs.h
@@ -115,13 +115,6 @@ typedef enum {
 
 /* APPOINTMENTS */
 typedef enum {
-    olFree = 0,
-    olTentative = 1,
-    olBusy = 2,
-    olOutOfOffice = 3
-} OlBusyStatus; /* Appointment flags with PR_APPOINTMENT_BUSY_STATUS */
-
-typedef enum {
     olOrganizer = 0,
     olRequired = 1,
     olOptional = 2,
diff --git a/src/libexchangemapi/e-mapi-fast-transfer.c b/src/libexchangemapi/e-mapi-fast-transfer.c
index 1d36496..b09db52 100644
--- a/src/libexchangemapi/e-mapi-fast-transfer.c
+++ b/src/libexchangemapi/e-mapi-fast-transfer.c
@@ -29,7 +29,6 @@
 #include "e-mapi-debug.h"
 
 #include "e-mapi-fast-transfer.h"
-#include "e-mapi-openchange.h"
 
 struct _EMapiFXParserClosure;
 typedef struct _EMapiFXParserClosure EMapiFXParserClosure;
@@ -269,10 +268,10 @@ parse_namedprop_cb (uint32_t proptag, struct MAPINAMEID nameid, void *closure)
 	guid = GUID_string (data->mem_ctx, &(nameid.lpguid));
 
 	if (nameid.ulKind == MNID_ID) {
-		if (e_mapi_nameid_lid_lookup_canonical (nameid.kind.lid, guid, &lid) != MAPI_E_SUCCESS)
+		if (mapi_nameid_lid_lookup_canonical (nameid.kind.lid, guid, &lid) != MAPI_E_SUCCESS)
 			lid = MAPI_E_RESERVED;
 	} else if (nameid.ulKind == MNID_STRING) {
-		if (e_mapi_nameid_string_lookup_canonical (nameid.kind.lpwstr.Name, guid, &lid) != MAPI_E_SUCCESS)
+		if (mapi_nameid_string_lookup_canonical (nameid.kind.lpwstr.Name, guid, &lid) != MAPI_E_SUCCESS)
 			lid = MAPI_E_RESERVED;
 	}
 
@@ -368,7 +367,7 @@ e_mapi_fast_transfer_internal (EMapiConnection *conn,
 	enum MAPISTATUS ms;
 	enum TransferStatus transferStatus;
 	uint16_t stepCount = -1, totalCount = -1;
-	struct e_mapi_fx_parser_context *parser;
+	struct fx_parser_context *parser;
 	EMapiFXParserClosure data = { 0 };
 
 	data.conn = conn;
@@ -401,11 +400,11 @@ e_mapi_fast_transfer_internal (EMapiConnection *conn,
 		data.marker = PidTagStartMessage;
 	}
 		
-	parser = e_mapi_fxparser_init (data.mem_ctx, &data);
-	e_mapi_fxparser_set_marker_callback (parser, parse_marker_cb);
-	e_mapi_fxparser_set_delprop_callback (parser, parse_delprop_cb);
-	e_mapi_fxparser_set_namedprop_callback (parser, parse_namedprop_cb);
-	e_mapi_fxparser_set_property_callback (parser, parse_property_cb);
+	parser = fxparser_init (data.mem_ctx, &data);
+	fxparser_set_marker_callback (parser, parse_marker_cb);
+	fxparser_set_delprop_callback (parser, parse_delprop_cb);
+	fxparser_set_namedprop_callback (parser, parse_namedprop_cb);
+	fxparser_set_property_callback (parser, parse_property_cb);
 
 	do {
 		DATA_BLOB transferdata;
@@ -414,7 +413,7 @@ e_mapi_fast_transfer_internal (EMapiConnection *conn,
 		if (ms != MAPI_E_SUCCESS)
 			break;
 
-		ms = e_mapi_fxparser_parse (parser, &transferdata);
+		ms = fxparser_parse (parser, &transferdata);
 		if (ms != MAPI_E_SUCCESS)
 			break;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]