Miscellaneous cleanups.

5 files changed, 35 insertions, 31 deletions

diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index ea0bcd70f1..c076d80085 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -405,7 +405,7 @@ static void
 e_mail_formatter_attachment_class_init (EMailFormatterExtensionClass *class)
 {
 	class->display_name = _("Attachment");
-	class->description =  _("Display as attachment");
+	class->description = _("Display as attachment");
 	class->mime_types = formatter_mime_types;
 	class->priority = G_PRIORITY_LOW;
 	class->format = emfe_attachment_format;
diff --git a/em-format/e-mail-formatter-enums.h b/em-format/e-mail-formatter-enums.h
index e5b7d5e489..862d66e4fa 100644
--- a/em-format/e-mail-formatter-enums.h
+++ b/em-format/e-mail-formatter-enums.h
@@ -33,20 +33,20 @@ typedef enum {
 } EMailFormatterColor;
 
 typedef enum { /*< flags >*/
-	E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSABLE	= 1 << 0,
-	E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED		= 1 << 1,
-	E_MAIL_FORMATTER_HEADER_FLAG_HTML		= 1 << 2,
-	E_MAIL_FORMATTER_HEADER_FLAG_NOCOLUMNS		= 1 << 3,
-	E_MAIL_FORMATTER_HEADER_FLAG_BOLD		= 1 << 4,
-	E_MAIL_FORMATTER_HEADER_FLAG_NODEC		= 1 << 5,
-	E_MAIL_FORMATTER_HEADER_FLAG_HIDDEN		= 1 << 6,
-	E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS		= 1 << 7,
-	E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE		= 1 << 8
+	E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSABLE = 1 << 0,
+	E_MAIL_FORMATTER_HEADER_FLAG_COLLAPSED = 1 << 1,
+	E_MAIL_FORMATTER_HEADER_FLAG_HTML = 1 << 2,
+	E_MAIL_FORMATTER_HEADER_FLAG_NOCOLUMNS = 1 << 3,
+	E_MAIL_FORMATTER_HEADER_FLAG_BOLD = 1 << 4,
+	E_MAIL_FORMATTER_HEADER_FLAG_NODEC = 1 << 5,
+	E_MAIL_FORMATTER_HEADER_FLAG_HIDDEN = 1 << 6,
+	E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS = 1 << 7,
+	E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE = 1 << 8
 } EMailFormatterHeaderFlags;
 
 typedef enum {
-	E_MAIL_FORMATTER_MODE_INVALID			= -1,
-	E_MAIL_FORMATTER_MODE_NORMAL			= 0,
+	E_MAIL_FORMATTER_MODE_INVALID = -1,
+	E_MAIL_FORMATTER_MODE_NORMAL = 0,
 	E_MAIL_FORMATTER_MODE_SOURCE,
 	E_MAIL_FORMATTER_MODE_RAW,
 	E_MAIL_FORMATTER_MODE_CID,
@@ -55,8 +55,8 @@ typedef enum {
 } EMailFormatterMode;
 
 typedef enum { /*< flags >*/
-	E_MAIL_FORMATTER_QUOTE_FLAG_CITE	= 1 << 0,
-	E_MAIL_FORMATTER_QUOTE_FLAG_HEADERS	= 1 << 1,
+	E_MAIL_FORMATTER_QUOTE_FLAG_CITE = 1 << 0,
+	E_MAIL_FORMATTER_QUOTE_FLAG_HEADERS = 1 << 1,
 	E_MAIL_FORMATTER_QUOTE_FLAG_KEEP_SIG	= 1 << 2  /* do not strip signature */
 } EMailFormatterQuoteFlags;
 
@@ -88,17 +88,17 @@ typedef enum {
  *    Always check what's inside.
  **/
 typedef enum { /*< flags >*/
-	E_MAIL_PARSER_EXTENSION_INLINE			= 1 << 0,
-	E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION	= 1 << 1,
-	E_MAIL_PARSER_EXTENSION_COMPOUND_TYPE		= 1 << 2
+	E_MAIL_PARSER_EXTENSION_INLINE = 1 << 0,
+	E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION = 1 << 1,
+	E_MAIL_PARSER_EXTENSION_COMPOUND_TYPE = 1 << 2
 } EMailParserExtensionFlags;
 
 typedef enum { /*< flags >*/
-	E_MAIL_PART_VALIDITY_NONE	= 0,
-	E_MAIL_PART_VALIDITY_PGP	= 1 << 0,
-	E_MAIL_PART_VALIDITY_SMIME	= 1 << 1,
-	E_MAIL_PART_VALIDITY_SIGNED	= 1 << 2,
-	E_MAIL_PART_VALIDITY_ENCRYPTED	= 1 << 3
+	E_MAIL_PART_VALIDITY_NONE = 0,
+	E_MAIL_PART_VALIDITY_PGP = 1 << 0,
+	E_MAIL_PART_VALIDITY_SMIME = 1 << 1,
+	E_MAIL_PART_VALIDITY_SIGNED = 1 << 2,
+	E_MAIL_PART_VALIDITY_ENCRYPTED = 1 << 3
 } EMailPartValidityFlags;
 
 G_END_DECLS
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 1feb8e1bc9..374f2213aa 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -1181,9 +1181,9 @@ e_mail_formatter_set_color (EMailFormatter *formatter,
 	if (gdk_rgba_equal (color, format_color))
 		return;
 
-	format_color->red   = color->red;
+	format_color->red = color->red;
 	format_color->green = color->green;
-	format_color->blue  = color->blue;
+	format_color->blue = color->blue;
 
 	switch (type) {
 		case E_MAIL_FORMATTER_COLOR_BODY:
diff --git a/em-format/e-mail-part-attachment-bar.c b/em-format/e-mail-part-attachment-bar.c
index 604581e9f6..6a0a07c378 100644
--- a/em-format/e-mail-part-attachment-bar.c
+++ b/em-format/e-mail-part-attachment-bar.c
@@ -82,10 +82,10 @@ e_mail_part_attachment_bar_get_store (EMailPartAttachmentBar *part)
 		GtkTreeModel *tree_model;
 
 		/* Create the store only on demand. The EMailParser runs in a dedicated
-		   thread, but the EAttachmentStore is a GtkWidget descendant, which should
-		   be manipulated only from the main/UI thread, thus postpone its creating
-		   until it's really needed, which might be during the EMailFormatter run,
-		   which runs from the main/UI thread. */
+		 * thread, but the EAttachmentStore is a GtkWidget descendant, which should
+		 * be manipulated only from the main/UI thread, thus postpone its creating
+		 * until it's really needed, which might be during the EMailFormatter run,
+		 * which runs from the main/UI thread. */
 		tree_model = e_attachment_store_new ();
 		part->priv->store = E_ATTACHMENT_STORE (tree_model);
 	}
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index f3b853d77d..7fb38ac199 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -538,14 +538,18 @@ gboolean
 e_mail_part_is_inline (CamelMimePart *mime_part,
                        GQueue *extensions)
 {
-	const gchar *disposition;
 	EMailParserExtension *extension;
 	EMailParserExtensionClass *class;
+	const gchar *disposition;
+	gboolean is_inline = FALSE;
 
 	disposition = camel_mime_part_get_disposition (mime_part);
 
+	if (disposition != NULL)
+		is_inline = (g_ascii_strcasecmp (disposition, "inline") == 0);
+
 	if ((extensions == NULL) || g_queue_is_empty (extensions))
-		return disposition && g_ascii_strcasecmp (disposition, "inline") == 0;
+		return is_inline;
 
 	extension = g_queue_peek_head (extensions);
 	class = E_MAIL_PARSER_EXTENSION_GET_CLASS (extension);
@@ -556,7 +560,7 @@ e_mail_part_is_inline (CamelMimePart *mime_part,
 		return TRUE;
 
 	if (disposition != NULL)
-		return g_ascii_strcasecmp (disposition, "inline") == 0;
+		return is_inline;
 
 	/* Otherwise, use the default for this handler type. */
 	return (class->flags & E_MAIL_PARSER_EXTENSION_INLINE) != 0;