Coding style and whitespace cleanup.

30 files changed, 100 insertions, 102 deletions

diff --git a/em-format/e-mail-extension-registry.c b/em-format/e-mail-extension-registry.c
index 12bca0115b..00d6b55658 100644
--- a/em-format/e-mail-extension-registry.c
+++ b/em-format/e-mail-extension-registry.c
@@ -129,7 +129,7 @@ e_mail_extension_registry_add_extension (EMailExtensionRegistry *reg,
 		}
 
 		if (camel_debug ("emformat:registry")) {
-			printf("Added extension '%s' for type '%s'\n",
+			printf ("Added extension '%s' for type '%s'\n",
 				 G_OBJECT_TYPE_NAME (extension), types[i]);
 		}
 	}
@@ -165,7 +165,7 @@ e_mail_extension_registry_remove_extension (EMailExtensionRegistry *reg,
 		g_queue_remove (queue, extension);
 
 		if (camel_debug ("emformat:registry")) {
-			printf("Removed extension '%s' from type '%s'\n",
+			printf ("Removed extension '%s' from type '%s'\n",
 				G_OBJECT_TYPE_NAME (extension), types[i]);
 		}
 	}
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index d94e552c43..2117cf7885 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -82,7 +82,7 @@ find_attachment_store (GSList *parts,
 	do {
 		GSList *iter;
 
-		d(printf("Looking up attachment bar as %s\n", id));
+		d (printf ("Looking up attachment bar as %s\n", id));
 
 		for (iter = parts; iter; iter = iter->next) {
 			EMailPart *p = iter->data;
diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c
index c64682854b..c1a9285f77 100644
--- a/em-format/e-mail-formatter-headers.c
+++ b/em-format/e-mail-formatter-headers.c
@@ -173,12 +173,12 @@ write_contact_picture (CamelMimePart *part,
 			if (size >= 0) {
 				g_string_append_printf (
 					buffer,
-			    		"<img width=\"%d\" src=\"evo-file://%s\" />",
+					"<img width=\"%d\" src=\"evo-file://%s\" />",
 					size, camel_mime_part_get_filename (part));
 			} else {
 				g_string_append_printf (
 					buffer,
-			    		"<img src=\"evo-file://%s\" />",
+					"<img src=\"evo-file://%s\" />",
 					camel_mime_part_get_filename (part));
 			}
 		}
@@ -240,7 +240,7 @@ static void
 format_full_headers (EMailFormatter *formatter,
                      GString *buffer,
                      CamelMedium *part,
-		     guint32 mode,
+                     guint32 mode,
                      guint32 flags,
                      GCancellable *cancellable)
 {
@@ -283,7 +283,7 @@ format_full_headers (EMailFormatter *formatter,
 			if (!(addrs = camel_header_address_decode (header->value, hdr_charset)))
 				break;
 
-			html = g_string_new("");
+			html = g_string_new ("");
 			name = e_mail_formatter_format_address (
 					formatter, html, addrs, header->name, FALSE,
 					~(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE));
@@ -300,7 +300,7 @@ format_full_headers (EMailFormatter *formatter,
 			if (!(addrs = camel_header_address_decode (header->value, hdr_charset)))
 				break;
 
-			html = g_string_new("");
+			html = g_string_new ("");
 			name = e_mail_formatter_format_address (
 					formatter, html, addrs, header->name, FALSE,
 					!(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE));
@@ -411,7 +411,7 @@ format_full_headers (EMailFormatter *formatter,
 					e_mail_formatter_format_header (
 						formatter, buffer, part,
 						&xmailer, h->flags, charset);
-					if (strstr(use_header->value, "Evolution"))
+					if (strstr (use_header->value, "Evolution"))
 						have_icon = TRUE;
 				} else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) {
 					gchar *cp = header->value;
diff --git a/em-format/e-mail-formatter-message-rfc822.c b/em-format/e-mail-formatter-message-rfc822.c
index 11079d2653..9ec393cd0a 100644
--- a/em-format/e-mail-formatter-message-rfc822.c
+++ b/em-format/e-mail-formatter-message-rfc822.c
@@ -35,7 +35,7 @@
 
 #include <string.h>
 
-static const gchar* formatter_mime_types[] = { "message/rfc822",
+static const gchar * formatter_mime_types[] = { "message/rfc822",
 					       "application/vnd.evolution.rfc822.end",
 					       NULL };
 
diff --git a/em-format/e-mail-formatter-quote-headers.c b/em-format/e-mail-formatter-quote-headers.c
index 064e4b2bd8..9d0ea33d2d 100644
--- a/em-format/e-mail-formatter-quote-headers.c
+++ b/em-format/e-mail-formatter-quote-headers.c
@@ -62,14 +62,13 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_FORMATTER_EXTENSION,
 		e_mail_formatter_quote_formatter_extension_interface_init))
 
-
 static void
 emfqe_format_text_header (EMailFormatter *emf,
-			  GString *buffer,
-			  const gchar *label,
-			  const gchar *value,
-			  guint32 flags,
-			  gint is_html)
+                          GString *buffer,
+                          const gchar *label,
+                          const gchar *value,
+                          guint32 flags,
+                          gint is_html)
 {
 	const gchar *html;
 	gchar *mhtml = NULL;
@@ -104,11 +103,11 @@ static const gchar *addrspec_hdrs[] = {
 
 static void
 emfqe_format_header (EMailFormatter *formatter,
-		     GString *buffer,
-		     CamelMedium *part,
-		     struct _camel_header_raw *header,
-		     guint32 flags,
-		     const gchar *charset)
+                     GString *buffer,
+                     CamelMedium *part,
+                     struct _camel_header_raw *header,
+                     guint32 flags,
+                     const gchar *charset)
 {
 	CamelMimeMessage *msg = (CamelMimeMessage *) part;
 	gchar *name, *buf, *value = NULL;
@@ -193,7 +192,6 @@ emfqe_format_header (EMailFormatter *formatter,
 	g_free (value);
 }
 
-
 static gboolean
 emqfe_headers_format (EMailFormatterExtension *extension,
                       EMailFormatter *formatter,
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c b/em-format/e-mail-formatter-quote-message-rfc822.c
index 531815d120..ae2433f08c 100644
--- a/em-format/e-mail-formatter-quote-message-rfc822.c
+++ b/em-format/e-mail-formatter-quote-message-rfc822.c
@@ -35,7 +35,7 @@
 
 #include <string.h>
 
-static const gchar* formatter_mime_types[] = { "message/rfc822",
+static const gchar * formatter_mime_types[] = { "message/rfc822",
 					       "application/vnd.evolution.rfc822.end",
 					       NULL };
 
diff --git a/em-format/e-mail-formatter-quote-text-plain.c b/em-format/e-mail-formatter-quote-text-plain.c
index 90ed5729ed..4da491cf8e 100644
--- a/em-format/e-mail-formatter-quote-text-plain.c
+++ b/em-format/e-mail-formatter-quote-text-plain.c
@@ -89,9 +89,9 @@ emqfe_text_plain_format (EMailFormatterExtension *extension,
 
 	/* Check for RFC 2646 flowed text. */
 	type = camel_mime_part_get_content_type (part->part);
-	if (camel_content_type_is(type, "text", "plain")
-	    && (format = camel_content_type_param(type, "format"))
-	    && !g_ascii_strcasecmp(format, "flowed"))
+	if (camel_content_type_is (type, "text", "plain")
+	    && (format = camel_content_type_param (type, "format"))
+	    && !g_ascii_strcasecmp (format, "flowed"))
 		text_flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED;
 
 	filtered_stream = camel_stream_filter_new (stream);
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c
index 6cc34d00cc..48d037c831 100644
--- a/em-format/e-mail-formatter-secure-button.c
+++ b/em-format/e-mail-formatter-secure-button.c
@@ -113,7 +113,7 @@ static void
 viewcert_clicked (GtkWidget *button,
                   GtkWidget *parent)
 {
-	CamelCipherCertInfo *info = g_object_get_data((GObject *) button, "e-cert-info");
+	CamelCipherCertInfo *info = g_object_get_data ((GObject *) button, "e-cert-info");
 	ECert *ec = NULL;
 
 	if (info->cert_data)
@@ -134,7 +134,7 @@ viewcert_clicked (GtkWidget *button,
 
 		g_object_unref (ec);
 	} else {
-		g_warning("can't find certificate for %s <%s>",
+		g_warning ("can't find certificate for %s <%s>",
 			info->name ? info->name : "",
 			info->email ? info->email : "");
 	}
@@ -169,7 +169,7 @@ add_cert_table (GtkWidget *grid,
 
 		if (info->name) {
 			if (info->email && strcmp (info->name, info->email) != 0)
-				l = la = g_strdup_printf("%s <%s>", info->name, info->email);
+				l = la = g_strdup_printf ("%s <%s>", info->name, info->email);
 			else
 				l = info->name;
 		} else {
@@ -187,9 +187,9 @@ add_cert_table (GtkWidget *grid,
 			g_free (la);
 			gtk_table_attach (table, w, 0, 1, n, n + 1, GTK_FILL, GTK_FILL, 3, 3);
 #if defined (HAVE_NSS) && defined (ENABLE_SMIME)
-			w = gtk_button_new_with_mnemonic(_("_View Certificate"));
+			w = gtk_button_new_with_mnemonic (_("_View Certificate"));
 			gtk_table_attach (table, w, 1, 2, n, n + 1, 0, 0, 3, 3);
-			g_object_set_data((GObject *)w, "e-cert-info", info);
+			g_object_set_data ((GObject *) w, "e-cert-info", info);
 			g_signal_connect (
 				w, "clicked",
 				G_CALLBACK (viewcert_clicked), grid);
@@ -274,9 +274,9 @@ secure_button_clicked_cb (GtkWidget *widget,
 	builder = gtk_builder_new ();
 	e_load_ui_builder_definition (builder, "mail-dialogs.ui");
 
-	dialog = e_builder_get_widget(builder, "message_security_dialog");
+	dialog = e_builder_get_widget (builder, "message_security_dialog");
 
-	grid = e_builder_get_widget(builder, "signature_grid");
+	grid = e_builder_get_widget (builder, "signature_grid");
 	w = gtk_label_new (_(smime_sign_table[part->validity->sign.status].description));
 	gtk_misc_set_alignment ((GtkMisc *) w, 0.0, 0.5);
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
@@ -293,7 +293,7 @@ secure_button_clicked_cb (GtkWidget *widget,
 				 "vscrollbar_policy", GTK_POLICY_AUTOMATIC,
 				 "shadow_type", GTK_SHADOW_IN,
 				 "expand", TRUE,
-				 "child", g_object_new(gtk_text_view_get_type(),
+				 "child", g_object_new (gtk_text_view_get_type (),
 						       "buffer", buffer,
 						       "cursor_visible", FALSE,
 						       "editable", FALSE,
@@ -312,7 +312,7 @@ secure_button_clicked_cb (GtkWidget *widget,
 
 	gtk_widget_show_all (grid);
 
-	grid = e_builder_get_widget(builder, "encryption_grid");
+	grid = e_builder_get_widget (builder, "encryption_grid");
 	w = gtk_label_new (_(smime_encrypt_table[part->validity->encrypt.status].description));
 	gtk_misc_set_alignment ((GtkMisc *) w, 0.0, 0.5);
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
@@ -329,7 +329,7 @@ secure_button_clicked_cb (GtkWidget *widget,
 				 "vscrollbar_policy", GTK_POLICY_AUTOMATIC,
 				 "shadow_type", GTK_SHADOW_IN,
 				 "expand", TRUE,
-				 "child", g_object_new(gtk_text_view_get_type(),
+				 "child", g_object_new (gtk_text_view_get_type (),
 						       "buffer", buffer,
 						       "cursor_visible", FALSE,
 						       "editable", FALSE,
diff --git a/em-format/e-mail-formatter-text-enriched.c b/em-format/e-mail-formatter-text-enriched.c
index 56dcdef4ee..cd01b4d3e2 100644
--- a/em-format/e-mail-formatter-text-enriched.c
+++ b/em-format/e-mail-formatter-text-enriched.c
@@ -73,7 +73,7 @@ emfe_text_enriched_format (EMailFormatterExtension *extension,
 	if (g_cancellable_is_cancelled (cancellable))
 		return FALSE;
 
-	if (!g_strcmp0(part->mime_type, "text/richtext")) {
+	if (!g_strcmp0 (part->mime_type, "text/richtext")) {
 		filter_flags = CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT;
 	}
 
diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c
index e5d25a39b7..f4fb3ea4dd 100644
--- a/em-format/e-mail-formatter-text-html.c
+++ b/em-format/e-mail-formatter-text-html.c
@@ -219,7 +219,7 @@ emfe_text_html_format (EMailFormatterExtension *extension,
 		} while (pos);
 
 		if (tags)
-			printf("\n\n**%s**\n\n", (gchar *) tags->data);
+			printf ("\n\n**%s**\n\n", (gchar *) tags->data);
 
 		/* Something's wrong, let's write the entire HTML and hope
 		 * that WebKit can handle it */
diff --git a/em-format/e-mail-formatter-text-plain.c b/em-format/e-mail-formatter-text-plain.c
index e7147e85de..7fd63b5566 100644
--- a/em-format/e-mail-formatter-text-plain.c
+++ b/em-format/e-mail-formatter-text-plain.c
@@ -100,9 +100,9 @@ emfe_text_plain_format (EMailFormatterExtension *extension,
 			return FALSE;
 
 		/* Check for RFC 2646 flowed text. */
-		if (camel_content_type_is(dw->mime_type, "text", "plain")
-		&& (format = camel_content_type_param(dw->mime_type, "format"))
-		&& !g_ascii_strcasecmp(format, "flowed"))
+		if (camel_content_type_is (dw->mime_type, "text", "plain")
+		&& (format = camel_content_type_param (dw->mime_type, "format"))
+		&& !g_ascii_strcasecmp (format, "flowed"))
 			filter_flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED;
 
 		rgb = e_color_to_value ((GdkColor *)
diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c
index 994b257600..883d985510 100644
--- a/em-format/e-mail-formatter-utils.c
+++ b/em-format/e-mail-formatter-utils.c
@@ -130,7 +130,7 @@ e_mail_formatter_format_address (EMailFormatter *formatter,
 
 				/* rfc2368 for mailto syntax and url encoding extras */
 				if ((real = camel_header_encode_phrase ((guchar *) a->name))) {
-					mailaddr = g_strdup_printf("%s <%s>", real, a->v.addr);
+					mailaddr = g_strdup_printf ("%s <%s>", real, a->v.addr);
 					g_free (real);
 					mailto = camel_url_encode (mailaddr, "?=&()");
 					g_free (mailaddr);
@@ -288,7 +288,7 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
 
 		g_free (buf);
 
-		html = g_string_new("");
+		html = g_string_new ("");
 		img = e_mail_formatter_format_address (formatter, html, addrs, (gchar *) label,
 			(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS),
 			!(flags & E_MAIL_FORMATTER_HEADER_FLAG_NOELIPSIZE));
@@ -311,7 +311,7 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
 		g_free (buf);
 
 		flags |= E_MAIL_FORMATTER_HEADER_FLAG_BOLD;
-	} else if (!strcmp(name, "X-evolution-mailer")) {
+	} else if (!strcmp (name, "X-evolution-mailer")) {
 		/* pseudo-header */
 		label = _("Mailer");
 		txt = value = camel_header_format_ctext (header->value, charset);
@@ -363,7 +363,7 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
 		}
 		flags |= E_MAIL_FORMATTER_HEADER_FLAG_HTML |
 			 E_MAIL_FORMATTER_HEADER_FLAG_BOLD;
-	} else if (!strcmp(name, "Newsgroups")) {
+	} else if (!strcmp (name, "Newsgroups")) {
 		struct _camel_header_newsgroup *ng, *scan;
 		GString *html;
 
@@ -376,17 +376,17 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
 
 		g_free (buf);
 
-		html = g_string_new("");
+		html = g_string_new ("");
 		scan = ng;
 		while (scan) {
 			if (flags & E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS)
 				g_string_append_printf (html, "%s", scan->newsgroup);
 			else
-				g_string_append_printf(html, "<a href=\"news:%s\">%s</a>",
+				g_string_append_printf (html, "<a href=\"news:%s\">%s</a>",
 					scan->newsgroup, scan->newsgroup);
 			scan = scan->next;
 			if (scan)
-				g_string_append_printf(html, ", ");
+				g_string_append_printf (html, ", ");
 		}
 
 		camel_header_newsgroups_free (ng);
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 21779162c5..ac16647b7f 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -865,7 +865,7 @@ e_mail_formatter_format_finished (EMailFormatter *formatter,
 	g_return_val_if_fail (E_IS_MAIL_FORMATTER (formatter), NULL);
 	g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL);
 
-	context = g_object_get_data (G_OBJECT (result), "context");	
+	context = g_object_get_data (G_OBJECT (result), "context");
 
 	g_free (context->message_uid);
 	g_object_unref (context->message);
@@ -935,7 +935,7 @@ e_mail_formatter_format_as (EMailFormatter *formatter,
 
 	ok = FALSE;
 
-	d(printf("(%d) Formatting for part %s of type %s (found %d formatters)\n",
+	d (printf ("(%d) Formatting for part %s of type %s (found %d formatters)\n",
 		 _call_i, part->id, as_mime_type,
 		 formatters ? g_queue_get_length (formatters) : 0));
 
@@ -952,9 +952,9 @@ e_mail_formatter_format_as (EMailFormatter *formatter,
 					extension, formatter, context,
 					part, stream, cancellable);
 
-			d(printf("\t(%d) trying %s...%s\n", _call_i,
+			d (printf ("\t(%d) trying %s...%s\n", _call_i,
 					G_OBJECT_TYPE_NAME (extension),
-				 	ok ? "OK" : "failed"));
+					ok ? "OK" : "failed"));
 
 			if (ok)
 				break;
@@ -995,7 +995,7 @@ e_mail_formatter_format_text (EMailFormatter *formatter,
 		charset = formatter->priv->charset;
 	} else if (dw->mime_type
 		   && (charset = camel_content_type_param (dw->mime_type, "charset"))
-		   && g_ascii_strncasecmp(charset, "iso-8859-", 9) == 0) {
+		   && g_ascii_strncasecmp (charset, "iso-8859-", 9) == 0) {
 		CamelStream *null;
 
 		/* Since a few Windows mailers like to claim they sent
diff --git a/em-format/e-mail-inline-filter.c b/em-format/e-mail-inline-filter.c
index aa65708f7e..0c2e6b835e 100644
--- a/em-format/e-mail-inline-filter.c
+++ b/em-format/e-mail-inline-filter.c
@@ -184,9 +184,9 @@ inline_filter_add_part (EMailInlineFilter *emif,
 		camel_mime_part_set_filename (part, emif->filename);
 
 	/* pre-snoop the mime type of unknown objects, and poke and hack it into place */
-	if (camel_content_type_is(dw->mime_type, "application", "octet-stream")
+	if (camel_content_type_is (dw->mime_type, "application", "octet-stream")
 	    && (mimetype = e_mail_part_snoop_type (part))
-	    && strcmp(mimetype, "application/octet-stream") != 0) {
+	    && strcmp (mimetype, "application/octet-stream") != 0) {
 		camel_data_wrapper_set_mime_type (dw, mimetype);
 		camel_mime_part_set_content_type (part, mimetype);
 		if (emif->filename)
diff --git a/em-format/e-mail-parser-application-mbox.c b/em-format/e-mail-parser-application-mbox.c
index c4c6b50968..500b6bbc1e 100644
--- a/em-format/e-mail-parser-application-mbox.c
+++ b/em-format/e-mail-parser-application-mbox.c
@@ -57,7 +57,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "application/mbox",
+static const gchar * parser_mime_types[] = { "application/mbox",
 					    NULL };
 
 static GSList *
diff --git a/em-format/e-mail-parser-application-smime.c b/em-format/e-mail-parser-application-smime.c
index 877e8cb84b..11513e3dc2 100644
--- a/em-format/e-mail-parser-application-smime.c
+++ b/em-format/e-mail-parser-application-smime.c
@@ -57,7 +57,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "application/xpkcs7mime",
+static const gchar * parser_mime_types[] = { "application/xpkcs7mime",
 					    "application/x-pkcs7-mime",
 					    "application/pkcs7-mime",
 					    "application/pkcs7-signature",
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c
index e3c064a64e..ebdc274738 100644
--- a/em-format/e-mail-parser-inlinepgp-encrypted.c
+++ b/em-format/e-mail-parser-inlinepgp-encrypted.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "application/x-inlinepgp-encrypted",
+static const gchar * parser_mime_types[] = { "application/x-inlinepgp-encrypted",
 					    NULL };
 
 static GSList *
@@ -97,7 +97,7 @@ empe_inlinepgp_encrypted_parse (EMailParserExtension *extension,
 		parts = g_slist_concat (parts,
 				e_mail_parser_parse_part_as (parser,
 					part, part_id,
-				 	"application/vnd.evolution.source",
+					"application/vnd.evolution.source",
 					cancellable));
 
 		g_object_unref (cipher);
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c
index 53ecaf831a..82b8c98178 100644
--- a/em-format/e-mail-parser-inlinepgp-signed.c
+++ b/em-format/e-mail-parser-inlinepgp-signed.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "application/x-inlinepgp-signed",
+static const gchar * parser_mime_types[] = { "application/x-inlinepgp-signed",
 					    NULL };
 
 static GSList *
@@ -100,7 +100,7 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension,
 		parts = g_slist_concat (parts,
 				e_mail_parser_parse_part_as (
 					parser, part, part_id,
-				 	"application/vnd.evolution.source",
+					"application/vnd.evolution.source",
 					cancellable));
 
 		g_object_unref (cipher);
diff --git a/em-format/e-mail-parser-message-deliverystatus.c b/em-format/e-mail-parser-message-deliverystatus.c
index b4aeaf3497..3a86a9380e 100644
--- a/em-format/e-mail-parser-message-deliverystatus.c
+++ b/em-format/e-mail-parser-message-deliverystatus.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "message/delivery-status",
+static const gchar * parser_mime_types[] = { "message/delivery-status",
 					    "message/feedback-report",
 					    "message/disposition-notification",
 					    NULL };
diff --git a/em-format/e-mail-parser-message-external.c b/em-format/e-mail-parser-message-external.c
index 3c99e2d5ca..99b6b8bd57 100644
--- a/em-format/e-mail-parser-message-external.c
+++ b/em-format/e-mail-parser-message-external.c
@@ -55,7 +55,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "message/external-body",
+static const gchar * parser_mime_types[] = { "message/external-body",
 					    NULL };
 
 static GSList *
@@ -89,8 +89,8 @@ empe_msg_external_parse (EMailParserExtension *extension,
 		goto addPart;
 	}
 
-	if (!g_ascii_strcasecmp(access_type, "ftp") ||
-	    !g_ascii_strcasecmp(access_type, "anon-ftp")) {
+	if (!g_ascii_strcasecmp (access_type, "ftp") ||
+	    !g_ascii_strcasecmp (access_type, "anon-ftp")) {
 		const gchar *name, *site, *dir, *mode;
 		gchar *path;
 		gchar ftype[16];
@@ -104,12 +104,12 @@ empe_msg_external_parse (EMailParserExtension *extension,
 
 		/* Generate the path. */
 		if (dir)
-			path = g_strdup_printf("/%s/%s", *dir=='/'?dir+1:dir, name);
+			path = g_strdup_printf ("/%s/%s", *dir == '/' ? dir + 1 : dir, name);
 		else
-			path = g_strdup_printf("/%s", *name=='/'?name+1:name);
+			path = g_strdup_printf ("/%s", *name == '/' ? name + 1 : name);
 
 		if (mode && *mode)
-			sprintf(ftype, ";type=%c",  *mode);
+			sprintf (ftype, ";type=%c",  *mode);
 		else
 			ftype[0] = 0;
 
@@ -126,9 +126,9 @@ empe_msg_external_parse (EMailParserExtension *extension,
 
 		url = g_filename_to_uri (name, NULL, NULL);
 		if (site)
-			desc = g_strdup_printf(_("Pointer to local file (%s) valid at site \"%s\""), name, site);
+			desc = g_strdup_printf (_("Pointer to local file (%s) valid at site \"%s\""), name, site);
 		else
-			desc = g_strdup_printf(_("Pointer to local file (%s)"), name);
+			desc = g_strdup_printf (_("Pointer to local file (%s)"), name);
 	} else if (!g_ascii_strcasecmp (access_type, "URL")) {
 		const gchar *urlparam;
 		gchar *s, *d;
diff --git a/em-format/e-mail-parser-message-rfc822.c b/em-format/e-mail-parser-message-rfc822.c
index c80dfd200a..4632c6e0eb 100644
--- a/em-format/e-mail-parser-message-rfc822.c
+++ b/em-format/e-mail-parser-message-rfc822.c
@@ -58,7 +58,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "message/rfc822",
+static const gchar * parser_mime_types[] = { "message/rfc822",
 					    "message/news",
 					    NULL };
 
diff --git a/em-format/e-mail-parser-multipart-alternative.c b/em-format/e-mail-parser-multipart-alternative.c
index 2239279f6c..74826da814 100644
--- a/em-format/e-mail-parser-multipart-alternative.c
+++ b/em-format/e-mail-parser-multipart-alternative.c
@@ -54,7 +54,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "multipart/alternative", NULL };
+static const gchar * parser_mime_types[] = { "multipart/alternative", NULL };
 
 static gboolean
 related_display_part_is_attachment (CamelMimePart *part)
@@ -146,7 +146,7 @@ empe_mp_alternative_parse (EMailParserExtension *extension,
 	if (best) {
 		gint len = part_id->len;
 
-		g_string_append_printf(part_id, ".alternative.%d", bestid);
+		g_string_append_printf (part_id, ".alternative.%d", bestid);
 
 		parts = e_mail_parser_parse_part (
 			parser, best, part_id, cancellable);
diff --git a/em-format/e-mail-parser-multipart-appledouble.c b/em-format/e-mail-parser-multipart-appledouble.c
index 65b619f415..f8e1cf390f 100644
--- a/em-format/e-mail-parser-multipart-appledouble.c
+++ b/em-format/e-mail-parser-multipart-appledouble.c
@@ -50,7 +50,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "multipart/appledouble", NULL };
+static const gchar * parser_mime_types[] = { "multipart/appledouble", NULL };
 
 static GSList *
 empe_mp_appledouble_parse (EMailParserExtension *extension,
@@ -80,7 +80,7 @@ empe_mp_appledouble_parse (EMailParserExtension *extension,
 			gint len;
 			/* try the data fork for something useful, doubtful but who knows */
 			len = part_id->len;
-			g_string_append_printf(part_id, ".appledouble.1");
+			g_string_append_printf (part_id, ".appledouble.1");
 
 			parts = e_mail_parser_parse_part (
 					parser, mime_part, part_id, cancellable);
diff --git a/em-format/e-mail-parser-multipart-digest.c b/em-format/e-mail-parser-multipart-digest.c
index 3b20ba83a8..e723b7ee67 100644
--- a/em-format/e-mail-parser-multipart-digest.c
+++ b/em-format/e-mail-parser-multipart-digest.c
@@ -53,7 +53,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "multipart/digest",
+static const gchar * parser_mime_types[] = { "multipart/digest",
 					    NULL };
 
 static GSList *
@@ -91,7 +91,7 @@ empe_mp_digest_parse (EMailParserExtension *extension,
 		if (!subpart)
 			continue;
 
-		g_string_append_printf(part_id, ".digest.%d", i);
+		g_string_append_printf (part_id, ".digest.%d", i);
 
 		ct = camel_mime_part_get_content_type (subpart);
 
diff --git a/em-format/e-mail-parser-multipart-encrypted.c b/em-format/e-mail-parser-multipart-encrypted.c
index 7cf724201d..e85bcd2a98 100644
--- a/em-format/e-mail-parser-multipart-encrypted.c
+++ b/em-format/e-mail-parser-multipart-encrypted.c
@@ -52,7 +52,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init))
 
-static const gchar* parser_mime_types[] = { "multipart/encrypted", NULL };
+static const gchar * parser_mime_types[] = { "multipart/encrypted", NULL };
 
 static GSList *
 empe_mp_encrypted_parse (EMailParserExtension *extension,
@@ -84,7 +84,7 @@ empe_mp_encrypted_parse (EMailParserExtension *extension,
 				parts,
 				e_mail_parser_parse_part_as (
 					parser, part, part_id,
-				 	"application/vnd.evolution/source",
+					"application/vnd.evolution/source",
 					cancellable));
 
 		return parts;
@@ -92,7 +92,7 @@ empe_mp_encrypted_parse (EMailParserExtension *extension,
 
 	/* Currently we only handle RFC2015-style PGP encryption. */
 	protocol = camel_content_type_param (
-		((CamelDataWrapper *)mpe)->mime_type, "protocol");
+		((CamelDataWrapper *) mpe)->mime_type, "protocol");
 	if (!protocol || g_ascii_strcasecmp (protocol, "application/pgp-encrypted") != 0) {
 		parts = e_mail_parser_error (
 				parser, cancellable,
@@ -102,7 +102,7 @@ empe_mp_encrypted_parse (EMailParserExtension *extension,
 				parts,
 				e_mail_parser_parse_part_as (
 					parser, part, part_id,
-				   	"multipart/mixed", cancellable));
+					"multipart/mixed", cancellable));
 		return parts;
 	}
 
@@ -126,7 +126,7 @@ empe_mp_encrypted_parse (EMailParserExtension *extension,
 		parts = g_slist_concat (parts,
 				e_mail_parser_parse_part_as (
 					parser, part, part_id,
-				 	"multipart/mixed", cancellable));
+					"multipart/mixed", cancellable));
 
 		g_object_unref (opart);
 		g_object_unref (context);
diff --git a/em-format/e-mail-parser-multipart-mixed.c b/em-format/e-mail-parser-multipart-mixed.c
index 33663d8e9e..e00174cc45 100644
--- a/em-format/e-mail-parser-multipart-mixed.c
+++ b/em-format/e-mail-parser-multipart-mixed.c
@@ -54,7 +54,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "multipart/mixed",
+static const gchar * parser_mime_types[] = { "multipart/mixed",
 					    "multipart/report",
 					    "multipart/*",
 					    NULL };
@@ -92,7 +92,7 @@ empe_mp_mixed_parse (EMailParserExtension *extension,
 
 		subpart = camel_multipart_get_part (mp, i);
 
-		g_string_append_printf(part_id, ".mixed.%d", i);
+		g_string_append_printf (part_id, ".mixed.%d", i);
 
 		new_parts = e_mail_parser_parse_part (
 				parser, subpart, part_id, cancellable);
diff --git a/em-format/e-mail-parser-multipart-related.c b/em-format/e-mail-parser-multipart-related.c
index 548c1362d3..e72b61e26c 100644
--- a/em-format/e-mail-parser-multipart-related.c
+++ b/em-format/e-mail-parser-multipart-related.c
@@ -54,7 +54,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "multipart/related",
+static const gchar * parser_mime_types[] = { "multipart/related",
 					    NULL };
 
 static GSList *
@@ -90,7 +90,7 @@ empe_mp_related_parse (EMailParserExtension *extension,
 
 	/* The to-be-displayed part goes first */
 	partidlen = part_id->len;
-	g_string_append_printf(part_id, ".related.%d", displayid);
+	g_string_append_printf (part_id, ".related.%d", displayid);
 
 	parts = e_mail_parser_parse_part (
 			parser, display_part, part_id, cancellable);
@@ -107,7 +107,7 @@ empe_mp_related_parse (EMailParserExtension *extension,
 		if (body_part == display_part)
 			continue;
 
-		g_string_append_printf(part_id, ".related.%d", i);
+		g_string_append_printf (part_id, ".related.%d", i);
 
 		list = e_mail_parser_parse_part (
 				parser, body_part, part_id, cancellable);
diff --git a/em-format/e-mail-parser-multipart-signed.c b/em-format/e-mail-parser-multipart-signed.c
index 5dc07eb0ab..bd6e1e2970 100644
--- a/em-format/e-mail-parser-multipart-signed.c
+++ b/em-format/e-mail-parser-multipart-signed.c
@@ -52,7 +52,7 @@ G_DEFINE_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar* parser_mime_types[] = { "multipart/signed",
+static const gchar * parser_mime_types[] = { "multipart/signed",
 					    "application/pgp-signature",
 					    NULL };
 
@@ -108,13 +108,13 @@ empe_mp_signed_parse (EMailParserExtension *extension,
 	/* FIXME: duplicated in em-format-html-display.c */
 	if (mps->protocol) {
 #ifdef ENABLE_SMIME
-		if (g_ascii_strcasecmp("application/x-pkcs7-signature", mps->protocol) == 0
-		    || g_ascii_strcasecmp("application/pkcs7-signature", mps->protocol) == 0) {
+		if (g_ascii_strcasecmp ("application/x-pkcs7-signature", mps->protocol) == 0
+		    || g_ascii_strcasecmp ("application/pkcs7-signature", mps->protocol) == 0) {
 			cipher = camel_smime_context_new (session);
 			validity_type = E_MAIL_PART_VALIDITY_SMIME;
 		} else {
 #endif
-			if (g_ascii_strcasecmp("application/pgp-signature", mps->protocol) == 0) {
+			if (g_ascii_strcasecmp ("application/pgp-signature", mps->protocol) == 0) {
 				cipher = camel_gpg_context_new (session);
 				validity_type = E_MAIL_PART_VALIDITY_PGP;
 			}
@@ -131,7 +131,7 @@ empe_mp_signed_parse (EMailParserExtension *extension,
 		parts = g_slist_concat (parts,
 				e_mail_parser_parse_part_as (
 					parser, part, part_id,
-				 	"multipart/mixed", cancellable));
+					"multipart/mixed", cancellable));
 
 		return parts;
 	}
@@ -166,7 +166,7 @@ empe_mp_signed_parse (EMailParserExtension *extension,
 		GSList *mail_parts, *iter;
 		subpart = camel_multipart_get_part (CAMEL_MULTIPART (mps), i);
 
-		g_string_append_printf(part_id, ".signed.%d", i);
+		g_string_append_printf (part_id, ".signed.%d", i);
 
 		mail_parts = e_mail_parser_parse_part (
 				parser, subpart, part_id, cancellable);
diff --git a/em-format/e-mail-parser.c b/em-format/e-mail-parser.c
index d6ea080c9b..3b1b2a2a72 100644
--- a/em-format/e-mail-parser.c
+++ b/em-format/e-mail-parser.c
@@ -311,13 +311,13 @@ e_mail_parser_parse_sync (EMailParser *parser,
 	if (camel_debug_start ("emformat:parser")) {
 		GSList *iter;
 
-		printf("%s finished with EMailPartList:\n",
+		printf ("%s finished with EMailPartList:\n",
 				G_OBJECT_TYPE_NAME (parser));
 
 		for (iter = parts_list->list; iter; iter = iter->next) {
 			EMailPart *part = iter->data;
 			if (!part) continue;
-			printf("	id: %s | cid: %s | mime_type: %s | is_hidden: %d | is_attachment: %d\n",
+			printf ("	id: %s | cid: %s | mime_type: %s | is_hidden: %d | is_attachment: %d\n",
 				part->id, part->cid, part->mime_type,
 				part->is_hidden ? 1 : 0, part->is_attachment ? 1 : 0);
 		}
@@ -402,13 +402,13 @@ e_mail_parser_parse_finish (EMailParser *parser,
 	if (camel_debug_start ("emformat:parser")) {
 		GSList *iter;
 
-		printf("%s finished with EMailPartList:\n",
+		printf ("%s finished with EMailPartList:\n",
 				G_OBJECT_TYPE_NAME (parser));
 
 		for (iter = parts_list->list; iter; iter = iter->next) {
 			EMailPart *part = iter->data;
 			if (!part) continue;
-			printf("	id: %s | cid: %s | mime_type: %s | is_hidden: %d | is_attachment: %d\n",
+			printf ("	id: %s | cid: %s | mime_type: %s | is_hidden: %d | is_attachment: %d\n",
 				part->id, part->cid, part->mime_type,
 				part->is_hidden ? 1 : 0, part->is_attachment ? 1 : 0);
 		}
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index 858209b7df..0d96d56085 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -111,8 +111,8 @@ e_mail_part_snoop_type (CamelMimePart *part)
 
 	if (magic_type) {
 		if (name_type
-		    && (!strcmp(magic_type, "text/plain")
-			|| !strcmp(magic_type, "application/octet-stream")))
+		    && (!strcmp (magic_type, "text/plain")
+			|| !strcmp (magic_type, "application/octet-stream")))
 			res = name_type;
 		else
 			res = magic_type;
@@ -141,7 +141,7 @@ e_mail_part_snoop_type (CamelMimePart *part)
 		}
 	}
 
-	d(printf("Snooped mime type %s\n", res));
+	d (printf ("Snooped mime type %s\n", res));
 	return res;
 
 	/* We used to load parts to check their type, we don't anymore,
@@ -172,7 +172,7 @@ e_mail_part_is_attachment (CamelMimePart *part)
 	if (!dw)
 		return 0;
 
-	d(printf("checking is attachment %s/%s\n", dw->mime_type->type, dw->mime_type->subtype));
+	d (printf ("checking is attachment %s/%s\n", dw->mime_type->type, dw->mime_type->subtype));
 	return !(camel_content_type_is (dw->mime_type, "multipart", "*")
 		 || camel_content_type_is (
 			dw->mime_type, "application", "x-pkcs7-mime")
@@ -484,7 +484,7 @@ e_mail_part_describe (CamelMimePart *part,
 	const gchar *filename, *description;
 	gchar *content_type, *desc;
 
-	stext = g_string_new("");
+	stext = g_string_new ("");
 	content_type = g_content_type_from_mime_type (mime_type);
 	desc = g_content_type_get_description (
 		content_type != NULL ? content_type : mime_type);