From fad4af8a3d4c6f50f7bcceca8d545eb17d6fd056 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 27 May 2009 11:13:25 -0400
Subject: Prefer GLib basic types over C types.

---
 .../tools/evolution-addressbook-export-list-cards.c        | 14 +++++++-------
 .../tools/evolution-addressbook-export-list-folders.c      |  4 ++--
 addressbook/tools/evolution-addressbook-export.c           | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'addressbook/tools')

diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 72fa8a07e3..2b418345ae 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -242,7 +242,7 @@ gchar *e_contact_get_csv (EContact * contact, GSList * csv_all_fields);
 gchar *delivery_address_get_sub_field (const EContactAddress * delivery_address, DeliveryAddressField sub_field);
 gchar *check_null_pointer (gchar * orig);
 gchar *escape_string (gchar * orig);
-int output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format);
+gint output_n_cards_file (FILE * outputfile, GList *contacts, gint size, gint begin_no, CARD_FORMAT format);
 static void fork_to_background (void);
 void set_pre_defined_field (GSList ** pre_defined_fields);
 
@@ -566,10 +566,10 @@ escape_string (gchar *orig)
 	return dest;
 }
 
-int
-output_n_cards_file (FILE * outputfile, GList *contacts, int size, int begin_no, CARD_FORMAT format)
+gint
+output_n_cards_file (FILE * outputfile, GList *contacts, gint size, gint begin_no, CARD_FORMAT format)
 {
-	int i;
+	gint i;
 	if (format == CARD_FORMAT_VCARD) {
 		for (i = begin_no; i < size + begin_no; i++) {
 			EContact *contact = g_list_nth_data (contacts, i);
@@ -628,11 +628,11 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
 {
 	FILE *outputfile;
 	long length;
-	int IsFirstOne;
-	int series_no;
+	gint IsFirstOne;
+	gint series_no;
 	gchar *file_series_name;
 	CARD_FORMAT format;
-	int size;
+	gint size;
 
 	length = g_list_length (contacts);
 
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
index e93748861d..1f18686242 100644
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ b/addressbook/tools/evolution-addressbook-export-list-folders.c
@@ -61,8 +61,8 @@ action_list_folders_init (ActionContext * p_actctx)
 			EBook *book;
 			EBookQuery *query;
 			GList *contacts;
-			char *uri;
-			const char *name;
+			gchar *uri;
+			const gchar *name;
 
 			book = e_book_new (s, NULL);
 			if (!book
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index 1a7f86142b..c8ae956081 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -64,16 +64,16 @@ static GOptionEntry entries[] = {
 	{ NULL }
 };
 
-int
-main (int argc, char **argv)
+gint
+main (gint argc, gchar **argv)
 {
 	ActionContext actctx;
 	GOptionContext *context;
 	GError *error = NULL;
 
-	int current_action = ACTION_NOTHING;
-	int IsCSV = FALSE;
-	int IsVCard = FALSE;
+	gint current_action = ACTION_NOTHING;
+	gint IsCSV = FALSE;
+	gint IsVCard = FALSE;
 
 	/*i18n-lize */
 	bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR);
@@ -162,7 +162,7 @@ main (int argc, char **argv)
 		exit (-1);
 	}
 
-	/*FIXME:should free actctx's some char* field, such as output_file! but since the program will end, so that will not cause mem leak.  */
+	/*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);
 }
-- 
cgit