Prefer GLib basic types over C types.

1 files changed, 24 insertions, 24 deletions

diff --git a/em-format/em-format.h b/em-format/em-format.h
index a9d9356778..652ec33ae8 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -140,14 +140,14 @@ struct _EMFormatPURI {
 	void (*free)(struct _EMFormatPURI *p); /* optional callback for freeing user-fields */
 	struct _EMFormat *format;
 
-	char *uri;		/* will be the location of the part, may be empty */
-	char *cid;		/* will always be set, a fake one created if needed */
-	char *part_id;		/* will always be set, emf->part_id->str for this part */
+	gchar *uri;		/* will be the location of the part, may be empty */
+	gchar *cid;		/* will always be set, a fake one created if needed */
+	gchar *part_id;		/* will always be set, emf->part_id->str for this part */
 
 	EMFormatPURIFunc func;
 	CamelMimePart *part;
 
-	unsigned int use_count;	/* used by multipart/related to see if it was accessed */
+	guint use_count;	/* used by multipart/related to see if it was accessed */
 };
 
 /**
@@ -176,7 +176,7 @@ struct _EMFormatHeader {
 	struct _EMFormatHeader *next, *prev;
 
 	guint32 flags;		/* E_FORMAT_HEADER_* */
-	char name[1];
+	gchar name[1];
 };
 
 #define EM_FORMAT_HEADER_BOLD (1<<0)
@@ -218,7 +218,7 @@ struct _EMFormat {
 	CamelMimeMessage *message; /* the current message */
 
 	CamelFolder *folder;
-	char *uid;
+	gchar *uid;
 
 	GString *part_id;	/* current part id prefix, for identifying parts directly */
 
@@ -227,7 +227,7 @@ struct _EMFormat {
 	CamelSession *session; /* session, used for authentication when required */
 	CamelURL *base;	/* content-base header or absolute content-location, for any part */
 
-	const char *snoop_mime_type; /* if we snooped an application/octet-stream type, what we snooped */
+	const gchar *snoop_mime_type; /* if we snooped an application/octet-stream type, what we snooped */
 
 	/* for validity enveloping */
 	CamelCipherValidity *valid;
@@ -245,8 +245,8 @@ struct _EMFormat {
 	struct _EMFormatPURITree *pending_uri_level;
 
 	em_format_mode_t mode;	/* source/headers/etc */
-	char *charset;		/* charset override */
-	char *default_charset;	/* charset fallback */
+	gchar *charset;		/* charset override */
+	gchar *default_charset;	/* charset fallback */
 	gboolean composer; /* Formatting from composer ?*/
 	gboolean print;
 };
@@ -257,16 +257,16 @@ struct _EMFormatClass {
 	GHashTable *type_handlers;
 
 	/* lookup handler, default falls back to hashtable above */
-	const EMFormatHandler *(*find_handler)(EMFormat *, const char *mime_type);
+	const EMFormatHandler *(*find_handler)(EMFormat *, const gchar *mime_type);
 
 	/* start formatting a message */
-	void (*format_clone)(EMFormat *, CamelFolder *, const char *uid, CamelMimeMessage *, EMFormat *);
+	void (*format_clone)(EMFormat *, CamelFolder *, const gchar *uid, CamelMimeMessage *, EMFormat *);
 
 	/* some internel error/inconsistency */
-	void (*format_error)(EMFormat *, CamelStream *, const char *msg);
+	void (*format_error)(EMFormat *, CamelStream *, const gchar *msg);
 
 	/* use for external structured parts */
-	void (*format_attachment)(EMFormat *, CamelStream *, CamelMimePart *, const char *mime_type, const struct _EMFormatHandler *info);
+	void (*format_attachment)(EMFormat *, CamelStream *, CamelMimePart *, const gchar *mime_type, const struct _EMFormatHandler *info);
 
 	/* use for unparsable content */
 	void (*format_source)(EMFormat *, CamelStream *, CamelMimePart *);
@@ -287,9 +287,9 @@ struct _EMFormatClass {
 void		em_format_set_mode		(EMFormat *emf,
 						 em_format_mode_t type);
 void		em_format_set_charset		(EMFormat *emf,
-						 const char *charset);
+						 const gchar *charset);
 void		em_format_set_default_charset	(EMFormat *emf,
-						 const char *charset);
+						 const gchar *charset);
 
 /* also indicates to show all headers */
 void		em_format_clear_headers		(EMFormat *emf);
@@ -306,15 +306,15 @@ int		em_format_is_attachment		(EMFormat *emf,
 						 CamelMimePart *part);
 
 int		em_format_is_inline		(EMFormat *emf,
-						 const char *partid,
+						 const gchar *partid,
 						 CamelMimePart *part,
 						 const EMFormatHandler *handle);
 void		em_format_set_inline		(EMFormat *emf,
-						 const char *partid,
-						 int state);
+						 const gchar *partid,
+						 gint state);
 
-char *		em_format_describe_part		(CamelMimePart *part,
-						 const char *mime_type);
+gchar *		em_format_describe_part		(CamelMimePart *part,
+						 const gchar *mime_type);
 
 /* for implementers */
 GType		em_format_get_type		(void);
@@ -333,13 +333,13 @@ const EMFormatHandler *
 /* puri is short for pending uri ... really */
 EMFormatPURI *	em_format_add_puri		(EMFormat *emf,
 						 size_t size,
-						 const char *uri,
+						 const gchar *uri,
 						 CamelMimePart *part,
 						 EMFormatPURIFunc func);
 EMFormatPURI *	em_format_find_visible_puri	(EMFormat *emf,
-						 const char *uri);
+						 const gchar *uri);
 EMFormatPURI *	em_format_find_puri		(EMFormat *emf,
-						 const char *uri);
+						 const gchar *uri);
 void		em_format_clear_puri_tree	(EMFormat *emf);
 void		em_format_push_level		(EMFormat *emf);
 void		em_format_pull_level		(EMFormat *emf);
@@ -396,7 +396,7 @@ void		em_format_part			(EMFormat *emf,
 void		em_format_merge_handler		(EMFormat *new,
 						 EMFormat *old);
 
-const char * em_format_snoop_type (CamelMimePart *part);
+const gchar * em_format_snoop_type (CamelMimePart *part);
 
 G_END_DECLS