[evolution-mapi] Replace removed error-return macros

From: Milan Crha <mcrha src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-mapi] Replace removed error-return macros
Date: Tue, 2 Apr 2013 06:31:33 +0000 (UTC)
commit 365f736d015ba91f13726f18d0fe1abe3059ef86
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 2 08:30:28 2013 +0200

    Replace removed error-return macros

 src/addressbook/e-book-backend-mapi-contacts.c |   94 ++++++++++++------------
 src/addressbook/e-book-backend-mapi-gal.c      |    4 +-
 src/addressbook/e-book-backend-mapi.c          |    6 +-
 src/calendar/e-cal-backend-mapi.c              |   32 ++++----
 src/libexchangemapi/e-mapi-utils.h             |   30 ++++++++
 5 files changed, 98 insertions(+), 68 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi-contacts.c b/src/addressbook/e-book-backend-mapi-contacts.c
index b2012f4..aa216b0 100644
--- a/src/addressbook/e-book-backend-mapi-contacts.c
+++ b/src/addressbook/e-book-backend-mapi-contacts.c
@@ -395,11 +395,11 @@ ebbm_contacts_remove (EBookBackendMAPI *ebma, GCancellable *cancellable, GError
        EBookBackendMAPIContactsPrivate *priv;
        GError *mapi_error = NULL;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
 
        priv = E_BOOK_BACKEND_MAPI_CONTACTS (ebma)->priv;
-       e_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        if (E_BOOK_BACKEND_MAPI_CLASS (e_book_backend_mapi_contacts_parent_class)->op_remove)
                E_BOOK_BACKEND_MAPI_CLASS (e_book_backend_mapi_contacts_parent_class)->op_remove (ebma, 
cancellable, &mapi_error);
@@ -453,16 +453,16 @@ ebbm_contacts_create_contacts (EBookBackendMAPI *ebma, GCancellable *cancellable
        gchar *id;
        EContact *contact;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (vcards != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (added_contacts != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (vcards != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (added_contacts != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        ebmac = E_BOOK_BACKEND_MAPI_CONTACTS (ebma);
-       e_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        priv = ebmac->priv;
-       e_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        if (vcards->next) {
                g_propagate_error (error, EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk 
additions")));
@@ -538,16 +538,16 @@ ebbm_contacts_remove_contacts (EBookBackendMAPI *ebma, GCancellable *cancellable
        const GSList *l;
        mapi_object_t obj_folder;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (id_list != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (removed_ids != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (id_list != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (removed_ids != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        ebmac = E_BOOK_BACKEND_MAPI_CONTACTS (ebma);
-       e_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        priv = ebmac->priv;
-       e_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        e_book_backend_mapi_lock_connection (ebma);
 
@@ -612,16 +612,16 @@ ebbm_contacts_modify_contacts (EBookBackendMAPI *ebma, GCancellable *cancellable
        GError *mapi_error = NULL;
        mapi_id_t mid;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (vcards != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (modified_contacts != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (vcards != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (modified_contacts != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        ebmac = E_BOOK_BACKEND_MAPI_CONTACTS (ebma);
-       e_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        priv = ebmac->priv;
-       e_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        if (vcards->next != NULL) {
                g_propagate_error (error, EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk 
modifications")));
@@ -696,16 +696,16 @@ ebbm_contacts_get_contact (EBookBackendMAPI *ebma, GCancellable *cancellable, co
        gboolean status, has_obj_folder;
        GError *mapi_error = NULL;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (id != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (vcard != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (id != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (vcard != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        ebmac = E_BOOK_BACKEND_MAPI_CONTACTS (ebma);
-       e_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        priv = ebmac->priv;
-       e_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        if (E_BOOK_BACKEND_MAPI_CLASS (e_book_backend_mapi_contacts_parent_class)->op_get_contact)
                E_BOOK_BACKEND_MAPI_CLASS (e_book_backend_mapi_contacts_parent_class)->op_get_contact (ebma, 
cancellable, id, vcard, &mapi_error);
@@ -785,16 +785,16 @@ ebbm_contacts_get_contact_list (EBookBackendMAPI *ebma, GCancellable *cancellabl
        GSList *mids = NULL;
        struct TransferContactsData tcd = { 0 };
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (query != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (vCards != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (query != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (vCards != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        ebmac = E_BOOK_BACKEND_MAPI_CONTACTS (ebma);
-       e_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        priv = ebmac->priv;
-       e_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        if (E_BOOK_BACKEND_MAPI_CLASS (e_book_backend_mapi_contacts_parent_class)->op_get_contact_list)
                E_BOOK_BACKEND_MAPI_CLASS (e_book_backend_mapi_contacts_parent_class)->op_get_contact_list 
(ebma, cancellable, query, vCards, &mapi_error);
@@ -883,12 +883,12 @@ ebbm_contacts_get_contacts_count (EBookBackendMAPI *ebma,
        mapi_object_t obj_folder;
        GError *mapi_error = NULL;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (obj_total != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (obj_total != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        ebmac = E_BOOK_BACKEND_MAPI_CONTACTS (ebma);
-       e_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (ebmac->priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac->priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        e_book_backend_mapi_lock_connection (ebma);
 
@@ -943,14 +943,14 @@ ebbm_contacts_list_known_uids (EBookBackendMAPI *ebma,
        mapi_object_t obj_folder;
        GError *mapi_error = NULL;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (lku != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (lku->uid_to_rev != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (lku != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (lku->uid_to_rev != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        ebmac = E_BOOK_BACKEND_MAPI_CONTACTS (ebma);
-       e_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (ebmac->priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac->priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        e_book_backend_mapi_lock_connection (ebma);
 
@@ -1003,14 +1003,14 @@ ebbm_contacts_transfer_contacts (EBookBackendMAPI *ebma,
        gboolean status;
        GError *mapi_error = NULL;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI_CONTACTS (ebma), 
E_DATA_BOOK_STATUS_INVALID_ARG);
 
        ebmac = E_BOOK_BACKEND_MAPI_CONTACTS (ebma);
-       e_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebmac != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        priv = ebmac->priv;
-       e_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        e_book_backend_mapi_lock_connection (ebma);
 
diff --git a/src/addressbook/e-book-backend-mapi-gal.c b/src/addressbook/e-book-backend-mapi-gal.c
index c1b8166..e78fc65 100644
--- a/src/addressbook/e-book-backend-mapi-gal.c
+++ b/src/addressbook/e-book-backend-mapi-gal.c
@@ -246,8 +246,8 @@ ebbm_gal_get_contacts_count (EBookBackendMAPI *ebma,
        EMapiConnection *conn;
        GError *mapi_error = NULL;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (obj_total != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (obj_total != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        e_book_backend_mapi_lock_connection (ebma);
 
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index 00cc669..84ff517 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -551,9 +551,9 @@ ebbm_remove (EBookBackendMAPI *ebma, GCancellable *cancellable, GError **error)
 {
        EBookBackendMAPIPrivate *priv;
 
-       e_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI (ebma), E_DATA_BOOK_STATUS_INVALID_ARG);
-       e_return_data_book_error_if_fail (ebma->priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_MAPI (ebma), E_DATA_BOOK_STATUS_INVALID_ARG);
+       e_mapi_return_data_book_error_if_fail (ebma->priv != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
 
        priv = ebma->priv;
 
diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
index c12fd5b..c94e452 100644
--- a/src/calendar/e-cal-backend-mapi.c
+++ b/src/calendar/e-cal-backend-mapi.c
@@ -901,7 +901,7 @@ ecbm_get_object (ECalBackend *backend, EDataCal *cal, GCancellable *cancellable,
        ECalComponent *comp;
 
        cbmapi = (ECalBackendMAPI *)(backend);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
 
        priv = cbmapi->priv;
 
@@ -1622,9 +1622,9 @@ ecbm_create_object (ECalBackend *backend, EDataCal *cal, GCancellable *cancellab
 
        kind = e_cal_backend_get_kind (E_CAL_BACKEND (backend));
 
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
-       e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (new_ecalcomp != NULL, InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (new_ecalcomp != NULL, InvalidArg);
 
        if (!e_backend_get_online (E_BACKEND (backend))) {
                g_propagate_error (error, EDC_ERROR (RepositoryOffline));
@@ -1808,8 +1808,8 @@ ecbm_modify_object (ECalBackend *backend, EDataCal *cal, GCancellable *cancellab
 
        kind = e_cal_backend_get_kind (backend);
 
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
-       e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
 
        if (!e_backend_get_online (E_BACKEND (backend))) {
                g_propagate_error (error, EDC_ERROR (RepositoryOffline));
@@ -1954,7 +1954,7 @@ ecbm_remove_object (ECalBackend *backend, EDataCal *cal, GCancellable *cancellab
        cbmapi = E_CAL_BACKEND_MAPI (backend);
        priv = cbmapi->priv;
 
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
 
        if (!e_backend_get_online (E_BACKEND (backend))) {
                g_propagate_error (error, EDC_ERROR (RepositoryOffline));
@@ -2061,8 +2061,8 @@ ecbm_send_objects (ECalBackend *backend, EDataCal *cal, GCancellable *cancellabl
 
        kind = e_cal_backend_get_kind (E_CAL_BACKEND (backend));
 
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
-       e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
 
        conn = e_cal_backend_mapi_get_connection (cbmapi, cancellable, &mapi_error);
        if (!conn) {
@@ -2239,8 +2239,8 @@ ecbm_receive_objects (ECalBackend *backend, EDataCal *cal, GCancellable *cancell
        priv = cbmapi->priv;
        kind = e_cal_backend_get_kind (E_CAL_BACKEND (backend));
 
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
-       e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
 
        if (!e_backend_get_online (E_BACKEND (backend))) {
                g_propagate_error (error, EDC_ERROR (RepositoryOffline));
@@ -2386,11 +2386,11 @@ ecbm_get_timezone (ECalBackend *backend, EDataCal *cal, GCancellable *cancellabl
        cbmapi = (ECalBackendMAPI *) backend;
        timezone_cache = E_TIMEZONE_CACHE (backend);
 
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
-       e_return_data_cal_error_if_fail (tzid != NULL, InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (tzid != NULL, InvalidArg);
 
        priv = cbmapi->priv;
-       e_return_data_cal_error_if_fail (priv != NULL, InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (priv != NULL, InvalidArg);
 
        zone = e_timezone_cache_get_timezone (timezone_cache, tzid);
 
@@ -2419,8 +2419,8 @@ ecbm_add_timezone (ECalBackend *backend, EDataCal *cal, GCancellable *cancellabl
        cbmapi = (ECalBackendMAPI *) backend;
        timezone_cache = E_TIMEZONE_CACHE (backend);
 
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
-       e_return_data_cal_error_if_fail (tzobj != NULL, InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_MAPI (cbmapi), InvalidArg);
+       e_mapi_return_data_cal_error_if_fail (tzobj != NULL, InvalidArg);
 
        tz_comp = icalparser_parse_string (tzobj);
        if (!tz_comp) {
diff --git a/src/libexchangemapi/e-mapi-utils.h b/src/libexchangemapi/e-mapi-utils.h
index 17e0bd5..4fc9baf 100644
--- a/src/libexchangemapi/e-mapi-utils.h
+++ b/src/libexchangemapi/e-mapi-utils.h
@@ -30,6 +30,36 @@
 #include "e-mapi-debug.h"
 #include "e-mapi-connection.h"
 
+#define e_mapi_return_data_cal_error_if_fail(expr, _code)                      \
+       G_STMT_START {                                                          \
+               if (G_LIKELY (expr)) {                                          \
+               } else {                                                        \
+                       g_log (G_LOG_DOMAIN,                                    \
+                               G_LOG_LEVEL_CRITICAL,                           \
+                               "file %s: line %d (%s): assertion `%s' failed", \
+                               __FILE__, __LINE__, G_STRFUNC, #expr);          \
+                       g_set_error (error, E_DATA_CAL_ERROR, (_code),          \
+                               "file %s: line %d (%s): assertion `%s' failed", \
+                               __FILE__, __LINE__, G_STRFUNC, #expr);          \
+                       return;                                                 \
+               }                                                               \
+       } G_STMT_END
+
+#define e_mapi_return_data_book_error_if_fail(expr, _code)                     \
+       G_STMT_START {                                                          \
+               if (G_LIKELY (expr)) {                                          \
+               } else {                                                        \
+                       g_log (G_LOG_DOMAIN,                                    \
+                               G_LOG_LEVEL_CRITICAL,                           \
+                               "file %s: line %d (%s): assertion `%s' failed", \
+                               __FILE__, __LINE__, G_STRFUNC, #expr);          \
+                       g_set_error (error, E_DATA_BOOK_ERROR, (_code),         \
+                               "file %s: line %d (%s): assertion `%s' failed", \
+                               __FILE__, __LINE__, G_STRFUNC, #expr);          \
+                       return;                                                 \
+               }                                                               \
+       } G_STMT_END
+
 typedef struct _EMapiCancellableRecMutex {
        GRecMutex rec_mutex;
        GMutex cond_mutex;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]