[evolution-kolab] Avoid e_return_data_book_error_if_fail().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab] Avoid e_return_data_book_error_if_fail().
- Date: Mon, 1 Apr 2013 21:06:49 +0000 (UTC)
commit a9afebedff8303d827008e5a9e2e12b1f27eb486
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Apr 1 17:01:26 2013 -0400
Avoid e_return_data_book_error_if_fail().
Arguments have already been validated, and anyway GError is not meant
for programming errors.
src/addressbook/e-book-backend-kolab.c | 30 ------------------------------
1 files changed, 0 insertions(+), 30 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-kolab.c b/src/addressbook/e-book-backend-kolab.c
index c978358..5534dee 100644
--- a/src/addressbook/e-book-backend-kolab.c
+++ b/src/addressbook/e-book-backend-kolab.c
@@ -244,8 +244,6 @@ book_backend_kolab_open (EBookBackendSync *backend,
GError *tmp_err = NULL;
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
(void)only_if_exists; /* FIXME */
@@ -350,8 +348,6 @@ book_backend_kolab_refresh (EBookBackendSync *backend,
EBookBackendKolabPrivate *priv = NULL;
#endif
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
#if 0
self = E_BOOK_BACKEND_KOLAB (backend);
@@ -377,11 +373,7 @@ book_backend_kolab_create_contacts (EBookBackendSync *backend,
GError *tmp_err = NULL;
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
- 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 && *added_contacts == NULL,
E_DATA_BOOK_STATUS_INVALID_ARG);
self = E_BOOK_BACKEND_KOLAB (backend);
priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
@@ -442,11 +434,7 @@ book_backend_kolab_remove_contacts (EBookBackendSync *backend,
GError *tmp_err = NULL;
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
- 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 && *removed_ids == NULL,
E_DATA_BOOK_STATUS_INVALID_ARG);
self = E_BOOK_BACKEND_KOLAB (backend);
priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
@@ -496,11 +484,7 @@ book_backend_kolab_modify_contacts (EBookBackendSync *backend,
GError *tmp_err = NULL;
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
- 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 && *modified_contacts == NULL,
E_DATA_BOOK_STATUS_INVALID_ARG);
self = E_BOOK_BACKEND_KOLAB (backend);
priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
@@ -550,11 +534,7 @@ book_backend_kolab_get_contact (EBookBackendSync *backend,
GError *tmp_err = NULL;
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
- e_return_data_book_error_if_fail (id != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (vcard != NULL && *vcard == NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
self = E_BOOK_BACKEND_KOLAB (backend);
priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
@@ -594,11 +574,7 @@ book_backend_kolab_get_contact_list (EBookBackendSync *backend,
GError *tmp_err = NULL;
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
- e_return_data_book_error_if_fail (query != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (contacts != NULL && *contacts == NULL,
E_DATA_BOOK_STATUS_INVALID_ARG);
self = E_BOOK_BACKEND_KOLAB (backend);
priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
@@ -657,11 +633,7 @@ book_backend_kolab_get_contact_list_uids (EBookBackendSync *backend,
GError *tmp_err = NULL;
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
- e_return_data_book_error_if_fail (query != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
- e_return_data_book_error_if_fail (contacts_uids != NULL && *contacts_uids == NULL,
E_DATA_BOOK_STATUS_INVALID_ARG);
self = E_BOOK_BACKEND_KOLAB (backend);
priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
@@ -758,9 +730,7 @@ book_backend_kolab_authenticate_user (EBookBackendSync *backend,
GError *tmp_err = NULL;
g_return_if_fail (error == NULL || *error == NULL);
- e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
/* cancellable may be NULL */
- e_return_data_book_error_if_fail (credentials != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
self = E_BOOK_BACKEND_KOLAB (backend);
priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]