From 948235c3d1076dbe6ed2e57a24c16a083bbd9f01 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 27 May 2009 10:29:19 -0400
Subject: Prefer GLib basic types over C types.

---
 addressbook/gui/widgets/eab-contact-display.c | 56 +++++++++++++--------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'addressbook/gui/widgets/eab-contact-display.c')

diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index fe87f3c72a..292edd4e18 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -252,7 +252,7 @@ contact_display_on_url_requested (GtkHTML *html,
 		if (!photo)
 			photo = e_contact_get (display->priv->contact, E_CONTACT_LOGO);
 
-		gtk_html_stream_write (handle, (char *)photo->data.inlined.data, photo->data.inlined.length);
+		gtk_html_stream_write (handle, (gchar *)photo->data.inlined.data, photo->data.inlined.length);
 
 		gtk_html_end (html, handle, GTK_HTML_STREAM_OK);
 
@@ -305,9 +305,9 @@ contact_display_on_link_clicked (GtkHTML *html,
 }
 
 static void
-render_name_value (GtkHTMLStream *html_stream, const char *label, const char *str, const char *icon, unsigned int html_flags)
+render_name_value (GtkHTMLStream *html_stream, const gchar *label, const gchar *str, const gchar *icon, guint html_flags)
 {
-	char *value = e_text_to_html (str, html_flags);
+	gchar *value = e_text_to_html (str, html_flags);
 
 	if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) {
 		gtk_html_stream_printf (html_stream, "<tr><td align=\"right\" valign=\"top\">%s</td> <td align=\"right\" valign=\"top\" width=\"100\" nowrap><font color=" HEADER_COLOR ">%s:</font></td>", value, label);
@@ -327,9 +327,9 @@ render_name_value (GtkHTMLStream *html_stream, const char *label, const char *st
 }
 
 static void
-render_attribute (GtkHTMLStream *html_stream, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
+render_attribute (GtkHTMLStream *html_stream, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags)
 {
-	const char *str;
+	const gchar *str;
 
 	str = e_contact_get_const (contact, field);
 
@@ -339,15 +339,15 @@ render_attribute (GtkHTMLStream *html_stream, EContact *contact, const char *htm
 }
 
 static void
-accum_address (GString *gstr, EContact *contact, const char *html_label, EContactField adr_field, EContactField label_field)
+accum_address (GString *gstr, EContact *contact, const gchar *html_label, EContactField adr_field, EContactField label_field)
 {
 	EContactAddress *adr;
-	const char *label;
+	const gchar *label;
 	gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
 
 	label = e_contact_get_const (contact, label_field);
 	if (label) {
-		char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
+		gchar *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL);
 
 #ifdef mapping_works
 		if (is_rtl)
@@ -392,9 +392,9 @@ accum_address (GString *gstr, EContact *contact, const char *html_label, EContac
 }
 
 static void
-accum_name_value (GString *gstr, const char *label, const char *str, const char *icon, unsigned int html_flags)
+accum_name_value (GString *gstr, const gchar *label, const gchar *str, const gchar *icon, guint html_flags)
 {
-	char *value = e_text_to_html (str, html_flags);
+	gchar *value = e_text_to_html (str, html_flags);
 
 	if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) {
 		g_string_append_printf (gstr, "<tr><td valign=\"top\" align=\"right\">%s</td> <td align=\"right\" valign=\"top\" width=\"100\" nowrap><font color=" HEADER_COLOR ">%s:</font></td>", value, label);
@@ -415,9 +415,9 @@ accum_name_value (GString *gstr, const char *label, const char *str, const char
 
 
 static void
-accum_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
+accum_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags)
 {
-	const char *str;
+	const gchar *str;
 
 	str = e_contact_get_const (contact, field);
 
@@ -427,11 +427,11 @@ accum_attribute (GString *gstr, EContact *contact, const char *html_label, ECont
 }
 
 static void
-accum_time_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
+accum_time_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags)
 {
 	EContactDate *date;
 	GDate *gdate = NULL;
-	char sdate[100];
+	gchar sdate[100];
 
 	date = e_contact_get (contact, field);
 	if (date) {
@@ -446,13 +446,13 @@ accum_time_attribute (GString *gstr, EContact *contact, const char *html_label,
 }
 
 static void
-accum_multival_attribute (GString *gstr, EContact *contact, const char *html_label, EContactField field, const char *icon, unsigned int html_flags)
+accum_multival_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags)
 {
 	GList *val_list, *l;
 
 	val_list = e_contact_get (contact, field);
 	for (l = val_list; l; l = l->next) {
-		const char *str = (const char *) l->data;
+		const gchar *str = (const gchar *) l->data;
 		accum_name_value (gstr, html_label, str, icon, html_flags);
 	}
 	g_list_foreach (val_list, (GFunc) g_free, NULL);
@@ -488,7 +488,7 @@ render_contact_list (GtkHTMLStream *html_stream, EContact *contact)
 }
 
 static void
-start_block (GtkHTMLStream *html_stream, const char *label)
+start_block (GtkHTMLStream *html_stream, const gchar *label)
 {
 	gtk_html_stream_printf (html_stream, "<tr><td height=\"20\" colspan=\"3\"><font color=" HEADER_COLOR "><b>%s</b></font></td></tr>", label);
 }
@@ -499,7 +499,7 @@ end_block (GtkHTMLStream *html_stream)
 	gtk_html_stream_printf (html_stream, "<tr><td height=\"20\">&nbsp;</td></tr>");
 }
 
-static const char *
+static const gchar *
 get_email_location (EVCardAttribute *attr)
 {
 	gint i;
@@ -519,10 +519,10 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
 	GList *email_list, *l, *email_attr_list, *al;
 	gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
 #ifdef HANDLE_MAILTO_INTERNALLY
-	int email_num = 0;
+	gint email_num = 0;
 #endif
 	const gchar *nl;
-	char *nick=NULL;
+	gchar *nick=NULL;
 
 	gtk_html_stream_printf (html_stream, "<table border=\"0\">");
 
@@ -535,8 +535,8 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
 	email_attr_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
 
 	for (l = email_list, al=email_attr_list; l && al; l = l->next, al = al->next) {
-		char *html = NULL, *name = NULL, *mail = NULL;
-		char *attr_str = (char *)get_email_location ((EVCardAttribute *) al->data);
+		gchar *html = NULL, *name = NULL, *mail = NULL;
+		gchar *attr_str = (gchar *)get_email_location ((EVCardAttribute *) al->data);
 
 #ifdef HANDLE_MAILTO_INTERNALLY
 		if (!eab_parse_qp_email (l->data, &name, &mail))
@@ -668,8 +668,8 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
 	gtk_html_stream_printf (html_stream, "<body><table width=\"100%%\"><tr><td %s>\n", is_rtl ? " align=\"right\" " : "");
 
 	if (contact) {
-		const char *str;
-		char *html;
+		const gchar *str;
+		gchar *html;
 		EContactPhoto *photo;
 
 		gtk_html_stream_printf (html_stream, "<table cellspacing=\"20\" border=\"0\"><td %s valign=\"top\">", is_rtl ? " align=\"right\" " : "");
@@ -723,8 +723,8 @@ eab_contact_display_render_compact (EABContactDisplay *display,
 	gtk_html_stream_write (html_stream, "<body>\n", 7);
 
 	if (contact) {
-		const char *str;
-		char *html;
+		const gchar *str;
+		gchar *html;
 		EContactPhoto *photo;
 		guint bg_frame = 0x000000, bg_body = 0xEEEEEE;
 		GtkStyle *style;
@@ -758,7 +758,7 @@ eab_contact_display_render_compact (EABContactDisplay *display,
 		if (!photo)
 			photo = e_contact_get (contact, E_CONTACT_LOGO);
 		if (photo) {
-			int calced_width = MAX_COMPACT_IMAGE_DIMENSION, calced_height = MAX_COMPACT_IMAGE_DIMENSION;
+			gint calced_width = MAX_COMPACT_IMAGE_DIMENSION, calced_height = MAX_COMPACT_IMAGE_DIMENSION;
 			GdkPixbufLoader *loader = gdk_pixbuf_loader_new ();
 			GdkPixbuf *pixbuf;
 
@@ -773,7 +773,7 @@ eab_contact_display_render_compact (EABContactDisplay *display,
 				g_object_ref (pixbuf);
 			g_object_unref (loader);
 			if (pixbuf) {
-				int max_dimension;
+				gint max_dimension;
 
 				calced_width = gdk_pixbuf_get_width (pixbuf);
 				calced_height = gdk_pixbuf_get_height (pixbuf);
-- 
cgit v1.2.3