Coding style and whitespace cleanup.

4 files changed, 21 insertions, 18 deletions

diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index 919e946152..057266c707 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -311,7 +311,8 @@ e_composer_name_header_get_destinations (EComposerNameHeader *header)
 
 	g_list_free (list);
 
-	return destinations;  /* free with e_destination_freev() */
+	/* free with e_destination_freev() */
+	return destinations;
 }
 
 void
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 85b51c0356..8d1408956d 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -125,10 +125,9 @@ struct _EMsgComposerPrivate {
 	gboolean is_from_message;
 
 	/* The mail composed has been sent. This bit will be set when
-	  the mail passed sanity checking and is sent out, which
-	  indicates that the composer can be destroyed. This bit can
-	  be set/get by using API
-	  e_msg_composer_{set,get}_mail_sent(). */
+	 * the mail passed sanity checking and is sent out, which
+	 * indicates that the composer can be destroyed. This bit can
+	 * be set/get by using API e_msg_composer_{set,get}_mail_sent (). */
 	gboolean mail_sent;
 };
 
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 821b063e62..9c80a193b9 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -153,8 +153,8 @@ emcu_part_to_html (CamelMimePart *part, gssize *len, EMFormat *source)
 			em_format_set_default_charset (
 				(EMFormat *) emfq, source->charset);
 	}
-	em_format_part((EMFormat *) emfq, (CamelStream *)mem, part);
-	g_object_unref(emfq);
+	em_format_part ((EMFormat *) emfq, (CamelStream *)mem, part);
+	g_object_unref (emfq);
 
 	camel_stream_write((CamelStream *) mem, "", 1, NULL);
 	g_object_unref (mem);
@@ -180,21 +180,21 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, .
 	EAlert *alert = NULL;
 
 	if (promptkey
-	    && !gconf_client_get_bool(gconf, promptkey, NULL)) {
+	    && !gconf_client_get_bool (gconf, promptkey, NULL)) {
 		g_object_unref (gconf);
 		return TRUE;
 	}
 
-	va_start(ap, tag);
-	alert = e_alert_new_valist(tag, ap);
-	va_end(ap);
+	va_start (ap, tag);
+	alert = e_alert_new_valist (tag, ap);
+	va_end (ap);
 
 	mbox = (GtkDialog*) e_alert_dialog_new (parent, alert);
 	g_object_unref (alert);
 
 	if (promptkey) {
 		check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again."));
-		gtk_container_set_border_width((GtkContainer *)check, 12);
+		gtk_container_set_border_width ((GtkContainer *)check, 12);
 		container = gtk_dialog_get_content_area (mbox);
 		gtk_box_pack_start (GTK_BOX (container), check, TRUE, TRUE, 0);
 		gtk_widget_show (check);
@@ -207,7 +207,7 @@ emcu_prompt_user (GtkWindow *parent, const gchar *promptkey, const gchar *tag, .
 			!gtk_toggle_button_get_active (
 			GTK_TOGGLE_BUTTON (check)), NULL);
 
-	gtk_widget_destroy((GtkWidget*) mbox);
+	gtk_widget_destroy ((GtkWidget*) mbox);
 	g_object_unref (gconf);
 
 	return button == GTK_RESPONSE_YES;
@@ -221,10 +221,10 @@ emcu_remove_xevolution_headers (CamelMimeMessage *message)
 
 	for (scan = ((CamelMimePart *)message)->headers;scan;scan=scan->next)
 		if (!strncmp(scan->name, "X-Evolution", 11))
-			camel_header_raw_append(&list, scan->name, scan->value, scan->offset);
+			camel_header_raw_append (&list, scan->name, scan->value, scan->offset);
 
 	for (scan=list;scan;scan=scan->next)
-		camel_medium_remove_header((CamelMedium *)message, scan->name);
+		camel_medium_remove_header ((CamelMedium *)message, scan->name);
 
 	return list;
 }
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 92368a4384..5b44e74ca2 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -77,7 +77,8 @@ EMsgComposer *	e_msg_composer_new_from_url	(EShell *shell,
 EMsgComposer *	e_msg_composer_new_redirect	(EShell *shell,
 						 CamelMimeMessage *message,
 						 const gchar *resent_from);
-EFocusTracker *	e_msg_composer_get_focus_tracker(EMsgComposer *composer);
+EFocusTracker *	e_msg_composer_get_focus_tracker
+						(EMsgComposer *composer);
 CamelSession *	e_msg_composer_get_session	(EMsgComposer *composer);
 EShell *	e_msg_composer_get_shell	(EMsgComposer *composer);
 
@@ -115,10 +116,12 @@ CamelMimeMessage *
 		e_msg_composer_get_message	(EMsgComposer *composer,
 						 gboolean save_html_object_data);
 CamelMimeMessage *
-		e_msg_composer_get_message_print(EMsgComposer *composer,
+		e_msg_composer_get_message_print
+						(EMsgComposer *composer,
 						 gboolean save_html_object_data);
 CamelMimeMessage *
-		e_msg_composer_get_message_draft(EMsgComposer *composer);
+		e_msg_composer_get_message_draft
+						(EMsgComposer *composer);
 void		e_msg_composer_show_sig_file	(EMsgComposer *composer);
 
 CamelInternetAddress *