Coding style and whitespace cleanup.

2 files changed, 36 insertions, 20 deletions

diff --git a/em-format/em-format.c b/em-format/em-format.c
index b82420ae7a..38a91b0955 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -1328,6 +1328,7 @@ em_format_format_text (EMFormat *emf,
 	const gchar *charset = NULL;
 	CamelMimeFilterWindows *windows = NULL;
 	CamelStream *mem_stream = NULL;
+	const gchar *key;
 	gsize size;
 	gsize max;
 	GConfClient *gconf;
@@ -1376,8 +1377,10 @@ em_format_format_text (EMFormat *emf,
 	max = -1;
 
 	gconf = gconf_client_get_default ();
-	if (gconf_client_get_bool (gconf, "/apps/evolution/mail/display/force_message_limit", NULL)) {
-		max = gconf_client_get_int (gconf, "/apps/evolution/mail/display/message_text_part_limit", NULL);
+	key = "/apps/evolution/mail/display/force_message_limit";
+	if (gconf_client_get_bool (gconf, key, NULL)) {
+		key = "/apps/evolution/mail/display/message_text_part_limit";
+		max = gconf_client_get_int (gconf, key, NULL);
 		if (max == 0)
 			max = -1;
 	}
@@ -2163,7 +2166,9 @@ emf_inlinepgp_encrypted (EMFormat *emf,
 
 static EMFormatHandler type_builtin_table[] = {
 #ifdef ENABLE_SMIME
-	{ (gchar *) "application/x-pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION },
+	{ (gchar *) "application/x-pkcs7-mime",
+	  emf_application_xpkcs7mime,
+	  EM_FORMAT_HANDLER_INLINE_DISPOSITION },
 #endif
 	{ (gchar *) "application/mbox", emf_application_mbox, EM_FORMAT_HANDLER_INLINE },
 	{ (gchar *) "multipart/alternative", emf_multipart_alternative },
@@ -2180,7 +2185,9 @@ static EMFormatHandler type_builtin_table[] = {
 
 	/* Insert brokenly-named parts here */
 #ifdef ENABLE_SMIME
-	{ (gchar *) "application/pkcs7-mime", (EMFormatFunc)emf_application_xpkcs7mime, EM_FORMAT_HANDLER_INLINE_DISPOSITION },
+	{ (gchar *) "application/pkcs7-mime",
+	  emf_application_xpkcs7mime,
+	  EM_FORMAT_HANDLER_INLINE_DISPOSITION },
 #endif
 
 	/* internal types */
diff --git a/em-format/em-format.h b/em-format/em-format.h
index ebe9e840b9..2bb9ea1099 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -188,44 +188,53 @@ struct _EMFormat {
 	GObject parent;
 	EMFormatPrivate *priv;
 
-	CamelMimeMessage *message; /* the current message */
+	/* The current message */
+	CamelMimeMessage *message;
 
 	CamelFolder *folder;
 	gchar *uid;
 
-	GString *part_id;	/* current part id prefix, for identifying parts directly */
+	/* Current part ID prefix for identifying parts directly. */
+	GString *part_id;
 
-	GQueue header_list;	/* if empty, then all */
+	/* If empty, then all. */
+	GQueue header_list;
 
-	CamelSession *session; /* session, used for authentication when required */
-	CamelURL *base;	/* content-base header or absolute content-location, for any part */
+	/* Used for authentication when required. */
+	CamelSession *session;
 
-	const gchar *snoop_mime_type; /* if we snooped an application/octet-stream type, what we snooped */
+	/* Content-Base header or absolute Content-Location, for any part. */
+	CamelURL *base;
 
-	/* for validity enveloping */
+	/* If we snooped an application/octet-stream, what we snooped. */
+	const gchar *snoop_mime_type;
+
+	/* For validity enveloping. */
 	CamelCipherValidity *valid;
 	CamelCipherValidity *valid_parent;
-	/* for checking whether found any signed/encrypted parts */
+
+	/* For checking whether we found any signed or encrypted parts. */
 	guint32 validity_found;
 
-	/* for forcing inlining */
+	/* For forcing inlining. */
 	GHashTable *inline_table;
 
-	/* global lookup table for message */
+	/* Global URI lookup table for message. */
 	GHashTable *pending_uri_table;
 
 	/* This structure is used internally to form a visibility tree of
 	 * parts in the current formatting stream.  This is to implement the
 	 * part resolution rules for RFC2387 to implement multipart/related. */
 	GNode *pending_uri_tree;
-	/* current level to search from */
+
+	/* The current level to search from. */
 	GNode *pending_uri_level;
 
-	EMFormatMode mode;	/* source/headers/etc */
-	gchar *charset;		/* charset override */
-	gchar *default_charset;	/* charset fallback */
-	gboolean composer; /* Formatting from composer ?*/
-	gboolean print;
+	EMFormatMode mode;		/* source/headers/etc */
+	gchar *charset;			/* charset override */
+	gchar *default_charset;		/* charset fallback */
+	gboolean composer;		/* formatting from composer? */
+	gboolean print;			/* formatting for printing? */
 };
 
 struct _EMFormatClass {