[evolution] evolution-addressbook-export: Return nothing from action functions.

[Matthew Barnes <mbarnes src gnome org>]

commit 8d6e1c903efbd4b2cb7bf9a07a1f565955343f33
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Feb 25 15:33:59 2013 -0500

    evolution-addressbook-export: Return nothing from action functions.
    
    The previous return value was not being checked anyway.

 .../evolution-addressbook-export-list-cards.c      |    8 +++-----
 .../evolution-addressbook-export-list-folders.c    |    8 +++-----
 addressbook/tools/evolution-addressbook-export.h   |    4 ++--
 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 86c5cb3..d6e9ecc 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 946deb6..2ff9d79 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 28168c4..158066f 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