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.

---
 mail/em-format-html.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'mail/em-format-html.h')

diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index eb8aec96e9..776a5fb9c9 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -114,13 +114,13 @@ struct _EMFormatHTMLJob {
 	struct _EMFormatPURITree *puri_level;
 	CamelURL *base;
 
-	void (*callback)(EMFormatHTMLJob *job, int cancelled);
+	void (*callback)(EMFormatHTMLJob *job, gint cancelled);
 	union {
-		char *uri;
+		gchar *uri;
 		CamelMedium *msg;
 		EMFormatPURI *puri;
 		struct _EMFormatPURITree *puri_level;
-		void *data;
+		gpointer data;
 	} u;
 };
 
@@ -154,7 +154,7 @@ struct _EMFormatHTMLPObject {
 	void (*free)(EMFormatHTMLPObject *);
 	EMFormatHTML *format;
 
-	char *classid;
+	gchar *classid;
 
 	EMFormatHTMLPObjectFunc func;
 	CamelMimePart *part;
@@ -213,12 +213,12 @@ struct _EMFormatHTML {
 	guint32 frame_colour;
 	guint32 content_colour;
 	guint32 citation_colour;
-	unsigned int load_http:2;
-	unsigned int load_http_now:1;
-	unsigned int mark_citations:1;
-	unsigned int simple_headers:1; /* simple header format, no box/table */
-	unsigned int hide_headers:1; /* no headers at all */
-	unsigned int show_icon:1; /* show an icon when the sender used Evo */
+	guint load_http:2;
+	guint load_http_now:1;
+	guint mark_citations:1;
+	guint simple_headers:1; /* simple header format, no box/table */
+	guint hide_headers:1; /* no headers at all */
+	guint show_icon:1; /* show an icon when the sender used Evo */
 	guint32 header_wrap_flags;
 
 	EMFormatHTMLState state; /* actual state of the object */
@@ -233,10 +233,10 @@ EMFormatHTML *	em_format_html_new		(void);
 void		em_format_html_load_http	(EMFormatHTML *efh);
 
 void		em_format_html_set_load_http	(EMFormatHTML *efh,
-						 int style);
+						 gint style);
 void		em_format_html_set_mark_citations
 						(EMFormatHTML *efh,
-						 int state,
+						 gint state,
 						 guint32 citation_colour);
 
 /* retrieves a pseudo-part icon wrapper for a file */
@@ -248,12 +248,12 @@ CamelMimePart *	em_format_html_file_part	(EMFormatHTML *efh,
 EMFormatHTMLPObject *
 		em_format_html_add_pobject	(EMFormatHTML *efh,
 						 size_t size,
-						 const char *classid,
+						 const gchar *classid,
 						 CamelMimePart *part,
 						 EMFormatHTMLPObjectFunc func);
 EMFormatHTMLPObject *
 		em_format_html_find_pobject	(EMFormatHTML *efh,
-						 const char *classid);
+						 const gchar *classid);
 EMFormatHTMLPObject *
 		em_format_html_find_pobject_func(EMFormatHTML *efh,
 						 CamelMimePart *part,
@@ -264,8 +264,8 @@ void		em_format_html_clear_pobject	(EMFormatHTML *efh);
 
 EMFormatHTMLJob *
 		em_format_html_job_new		(EMFormatHTML *efh,
-						 void (*callback)(EMFormatHTMLJob *job, int cancelled),
-						 void *data);
+						 void (*callback)(EMFormatHTMLJob *job, gint cancelled),
+						 gpointer data);
 void		em_format_html_job_queue	(EMFormatHTML *efh,
 						 EMFormatHTMLJob *job);
 
-- 
cgit v1.2.3