[evolution-kolab] Avoid e_return_data_cal_error_if_fail().

[Matthew Barnes <mbarnes src gnome org>]

commit 89c537956f315126c1d4beb62f6d586ce72b641e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Apr 1 17:06:59 2013 -0400

    Avoid e_return_data_cal_error_if_fail().
    
    Arguments have already been validated, and anyway GError is not meant
    for programming errors.

 src/calendar/e-cal-backend-kolab.c |   57 ------------------------------------
 1 files changed, 0 insertions(+), 57 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-kolab.c b/src/calendar/e-cal-backend-kolab.c
index 5114dda..901c015 100644
--- a/src/calendar/e-cal-backend-kolab.c
+++ b/src/calendar/e-cal-backend-kolab.c
@@ -269,8 +269,6 @@ cal_backend_kolab_open (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        /* cancellable may be NULL */
        (void)only_if_exists; /* FIXME */
 
@@ -408,8 +406,6 @@ cal_backend_kolab_refresh (ECalBackendSync *backend,
        /* ECalBackendKolabPrivate *priv = NULL; */
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        (void)cancellable; /* FIXME */ /* cancellable may be NULL */
 
        /* self = E_CAL_BACKEND_KOLAB (backend); */
@@ -516,12 +512,8 @@ cal_backend_kolab_get_object (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (uid != NULL, InvalidArg);
        (void)rid; /* FIXME */ /* rid may be NULL */
-       e_return_data_cal_error_if_fail (calobj != NULL && *calobj == NULL, InvalidArg);
 
        self = E_CAL_BACKEND_KOLAB (backend);
        priv = E_CAL_BACKEND_KOLAB_PRIVATE (self);
@@ -561,11 +553,8 @@ cal_backend_kolab_get_object_list (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        /* cancellable may be NULL */
        /* sexp may be NULL */
-       e_return_data_cal_error_if_fail (calobjs != NULL && *calobjs == NULL, InvalidArg);
 
        self = E_CAL_BACKEND_KOLAB (backend);
        priv = E_CAL_BACKEND_KOLAB_PRIVATE (self);
@@ -651,13 +640,9 @@ cal_backend_kolab_get_free_busy (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        (void)cancellable; /* FIXME */ /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (users != NULL, InvalidArg);
        (void)start; /* FIXME */
        (void)end; /* FIXME */
-       e_return_data_cal_error_if_fail (freebusyobjs != NULL && *freebusyobjs == NULL, InvalidArg);
 
        self = E_CAL_BACKEND_KOLAB (backend);
        priv = E_CAL_BACKEND_KOLAB_PRIVATE (self);
@@ -764,12 +749,7 @@ cal_backend_kolab_create_objects (ECalBackendSync *backend,
        gboolean ok = FALSE;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (calobjs != NULL && calobjs->data != NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (uids != NULL && *uids == NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (new_components != NULL && *new_components == NULL, InvalidArg);
 
        if (g_slist_next (calobjs) != NULL) {
                g_propagate_error (error, e_data_cal_create_error (UnsupportedMethod, _("Kolab does not 
support bulk additions")));
@@ -910,13 +890,8 @@ cal_backend_kolab_modify_objects (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (calobjs != NULL && calobjs->data != NULL, InvalidArg);
        (void)mod; /* FIXME */
-       e_return_data_cal_error_if_fail (old_components != NULL && *old_components == NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (new_components != NULL && *new_components == NULL, InvalidArg);
 
        if (calobjs->next) {
                g_propagate_error (error, e_data_cal_create_error (UnsupportedMethod, "Kolab does not support 
bulk modifications"));
@@ -1109,13 +1084,8 @@ cal_backend_kolab_remove_objects (ECalBackendSync *backend,
        gboolean ok = FALSE;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (ids != NULL && ids->data != NULL, InvalidArg);
        /* rid may be NULL */
-       e_return_data_cal_error_if_fail (old_components != NULL && *old_components == NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (new_components != NULL && *new_components == NULL, InvalidArg);
 
        if (ids->next) {
                g_propagate_error (error, e_data_cal_create_error (UnsupportedMethod, _("Kolab does not 
support bulk removals")));
@@ -1292,10 +1262,7 @@ cal_backend_kolab_receive_objects (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
 
        self = E_CAL_BACKEND_KOLAB (backend);
        priv = E_CAL_BACKEND_KOLAB_PRIVATE (self);
@@ -1396,12 +1363,7 @@ cal_backend_kolab_send_objects (ECalBackendSync *backend,
        /* ECalBackendKolabPrivate *priv = NULL; */
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        (void)cancellable; /* FIXME */ /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (users != NULL && *users == NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (modified_calobj != NULL && *modified_calobj == NULL, InvalidArg);
 
        /* self = E_CAL_BACKEND_KOLAB (backend); */
        /* priv = E_CAL_BACKEND_KOLAB_PRIVATE (self); */
@@ -1423,12 +1385,7 @@ cal_backend_kolab_get_attachment_uris (ECalBackendSync *backend,
        /* ECalBackendKolabPrivate *priv = NULL; */
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        (void)cancellable; /* FIXME */ /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (uid != NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (rid != NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (attachments != NULL && *attachments == NULL, InvalidArg);
 
        /* self = E_CAL_BACKEND_KOLAB (backend); */
        /* priv = E_CAL_BACKEND_KOLAB_PRIVATE (self); */
@@ -1449,12 +1406,7 @@ cal_backend_kolab_discard_alarm (ECalBackendSync *backend,
        /* ECalBackendKolabPrivate *priv = NULL; */
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        (void)cancellable; /* FIXME */ /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (uid != NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (rid != NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (auid != NULL, InvalidArg);
 
        /* self = E_CAL_BACKEND_KOLAB (backend); */
        /* priv = E_CAL_BACKEND_KOLAB_PRIVATE (self); */
@@ -1476,11 +1428,7 @@ cal_backend_kolab_get_timezone (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        (void)cancellable; /* unused */ /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (tzid != NULL, InvalidArg);
-       e_return_data_cal_error_if_fail (tzobject != NULL && *tzobject == NULL, InvalidArg);
 
        self = E_CAL_BACKEND_KOLAB (backend);
        priv = E_CAL_BACKEND_KOLAB_PRIVATE (self);
@@ -1521,10 +1469,7 @@ cal_backend_kolab_add_timezone (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
-       e_return_data_cal_error_if_fail (E_IS_DATA_CAL (cal), InvalidArg);
        (void)cancellable; /* FIXME */ /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (tzobject != NULL, InvalidArg);
 
        self = E_CAL_BACKEND_KOLAB (backend);
        priv = E_CAL_BACKEND_KOLAB_PRIVATE (self);
@@ -1573,9 +1518,7 @@ cal_backend_kolab_authenticate_user (ECalBackendSync *backend,
        GError *tmp_err = NULL;
 
        g_return_if_fail (error == NULL || *error == NULL);
-       e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_KOLAB (backend), InvalidArg);
        /* cancellable may be NULL */
-       e_return_data_cal_error_if_fail (credentials != NULL, InvalidArg);
 
        self = E_CAL_BACKEND_KOLAB (backend);
        priv = E_CAL_BACKEND_KOLAB_PRIVATE (self);