diff options
3 files changed, 8 insertions, 12 deletions
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index 86c5cb34d2..d6e9ecca57 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -688,7 +688,7 @@ set_pre_defined_field (GSList **pre_defined_fields) *pre_defined_fields = g_slist_append (*pre_defined_fields, GINT_TO_POINTER (E_CONTACT_CSV_NOTE)); } -guint +void action_list_cards_init (ActionContext *p_actctx) { ESourceRegistry *registry; @@ -714,9 +714,9 @@ action_list_cards_init (ActionContext *p_actctx) g_object_unref (source); /* Sanity check. */ - g_return_val_if_fail ( + g_return_if_fail ( ((client != NULL) && (error == NULL)) || - ((client == NULL) && (error != NULL)), FAILED); + ((client == NULL) && (error != NULL))); if (error != NULL) { g_warning ( @@ -747,6 +747,4 @@ action_list_cards_init (ActionContext *p_actctx) g_warning ("Failed to get contacts: %s", error->message); g_error_free (error); } - - return error ? FAILED : SUCCESS; } diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c index 946deb6cb3..2ff9d790a4 100644 --- a/addressbook/tools/evolution-addressbook-export-list-folders.c +++ b/addressbook/tools/evolution-addressbook-export-list-folders.c @@ -31,7 +31,7 @@ #include "evolution-addressbook-export.h" -guint +void action_list_folders_init (ActionContext *p_actctx) { ESourceRegistry *registry; @@ -67,9 +67,9 @@ action_list_folders_init (ActionContext *p_actctx) client = e_book_client_connect_sync (source, NULL, &error); /* Sanity check. */ - g_return_val_if_fail ( + g_return_if_fail ( ((client != NULL) && (error == NULL)) || - ((client == NULL) && (error != NULL)), FAILED); + ((client == NULL) && (error != NULL))); if (error != NULL) { g_warning ( @@ -111,6 +111,4 @@ action_list_folders_init (ActionContext *p_actctx) if (outputfile) fclose (outputfile); - - return SUCCESS; } diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h index 28168c40ff..158066fe25 100644 --- a/addressbook/tools/evolution-addressbook-export.h +++ b/addressbook/tools/evolution-addressbook-export.h @@ -53,10 +53,10 @@ struct _ActionContext { typedef struct _ActionContext ActionContext; /* action_list_folders */ -guint action_list_folders_init (ActionContext *p_actctx); +void action_list_folders_init (ActionContext *p_actctx); /*action list cards*/ -guint action_list_cards_init (ActionContext *p_actctx); +void action_list_cards_init (ActionContext *p_actctx); G_END_DECLS |