[evolution/account-mgmt: 11/25] Adapt addressbook/tools to the new ESource API.

[Matthew Barnes <mbarnes src gnome org>]

commit 2192b004cafddc6a9d56f9a024d4a6b6d5451625
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Dec 8 00:17:41 2010 -0500

    Adapt addressbook/tools to the new ESource API.

 .../evolution-addressbook-export-list-cards.c      |    3 +++
 .../evolution-addressbook-export-list-folders.c    |    2 ++
 addressbook/tools/evolution-addressbook-export.c   |    5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index ea3eb7a..8b2ab3f 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -22,6 +22,7 @@
 
 #include <config.h>
 
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -764,11 +765,13 @@ action_list_cards_init (ActionContext * p_actctx)
 	EBookQuery *query;
 	GList *contacts;
 
+#if 0  /* ACCOUNT_MGMT */
 	if (p_actctx->action_list_cards.addressbook_folder_uri != NULL) {
 		book = e_book_new_from_uri (p_actctx->action_list_cards.addressbook_folder_uri, NULL);
 	} else {
 		book = e_book_new_default_addressbook (NULL);
 	}
+#endif /* ACCOUNT_MGMT */
 
 	if (!book
 	    || !e_book_open (book, TRUE, NULL)) {
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
index 1f18686..55f2395 100644
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ b/addressbook/tools/evolution-addressbook-export-list-folders.c
@@ -34,6 +34,7 @@
 guint
 action_list_folders_init (ActionContext * p_actctx)
 {
+#if 0  /* ACCOUNT_MGMT */
 	ESourceList *addressbooks = NULL;
 	GSList *groups, *group;
 	FILE *outputfile = NULL;
@@ -93,6 +94,7 @@ action_list_folders_init (ActionContext * p_actctx)
 
 	if (outputfile)
 		fclose (outputfile);
+#endif
 
 	return SUCCESS;
 }
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 9c495e5..01e22ec 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -21,8 +21,9 @@
  */
 
 #include <config.h>
-
+#include <stdlib.h>
 #include <string.h>
+
 #include <glib.h>
 #include <glib/gi18n.h>
 
@@ -202,5 +203,5 @@ main (gint argc, gchar **argv)
 
 	/*FIXME:should free actctx's some gchar * field, such as output_file! but since the program will end, so that will not cause mem leak.  */
 
-	exit (0);
+	return 0;
 }