Whitespace cleanups.

6 files changed, 21 insertions, 22 deletions

diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index ba8b1f5a13..a8417efb95 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -32,7 +32,6 @@
 
 #include "em-format-html.h"
 
-
 #define d(x)
 
 #define E_HTTP_REQUEST_GET_PRIVATE(obj) \
@@ -168,8 +167,8 @@ http_request_finished (SoupRequest *request,
 
 static gssize
 copy_stream_to_stream (CamelStream *input,
-		       GMemoryInputStream *output,
-		       GCancellable *cancellable)
+                       GMemoryInputStream *output,
+                       GCancellable *cancellable)
 {
 	gchar *buff;
 	gssize read_len = 0;
@@ -195,7 +194,7 @@ copy_stream_to_stream (CamelStream *input,
 
 static void
 quit_main_loop (GCancellable *cancellable,
-	        GMainLoop *loop)
+                GMainLoop *loop)
 {
 	if (g_main_loop_is_running (loop)) {
 		g_main_loop_quit (loop);
@@ -364,7 +363,7 @@ handle_http_request (GSimpleAsyncResult *res,
 		g_cancellable_disconnect (cancellable, id);
 
 		/* Wait until all asynchronous operations are finished working
-		   with the 'data' structure so that it's not free'd too early. */
+		 * with the 'data' structure so that it's not free'd too early. */
 		e_flag_wait (data.flag);
 		e_flag_free (data.flag);
 
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index 0f505bc24b..3a4e85e166 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -623,8 +623,8 @@ mail_account_store_services_reordered (EMailAccountStore *store,
 	GError *error = NULL;
 
 	/* do not save order list if there are only two services - they
-	   should be 'local' and 'vfolder' at start, and these may not rewrite
-	   stored account order with other accounts
+	 * should be 'local' and 'vfolder' at start, and these may not rewrite
+	 * stored account order with other accounts
 	*/
 	model = GTK_TREE_MODEL (store);
 	if (!default_restored &&
@@ -1181,7 +1181,7 @@ e_mail_account_store_remove_service (EMailAccountStore *store,
 
 gboolean
 e_mail_account_store_has_service (EMailAccountStore *store,
-				  CamelService *service)
+                                  CamelService *service)
 {
 	GtkTreeIter iter;
 
@@ -1313,8 +1313,8 @@ e_mail_account_store_queue_enabled_services (EMailAccountStore *store,
 
 static gboolean
 mail_account_store_load_sort_order_queue (EMailAccountStore *store,
-					  GQueue *service_queue,
-					  GError **error)
+                                          GQueue *service_queue,
+                                          GError **error)
 {
 	EMailSession *session;
 	GKeyFile *key_file;
@@ -1362,7 +1362,7 @@ mail_account_store_load_sort_order_queue (EMailAccountStore *store,
 
 void
 e_mail_account_store_reorder_services (EMailAccountStore *store,
-				       gboolean use_default_order)
+                                       gboolean use_default_order)
 {
 	GQueue *current_order = NULL;
 	GQueue *default_order = NULL;
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 558755c1a4..ca807a6899 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -23,7 +23,6 @@
 #include <config.h>
 #endif
 
-
 #include "e-mail-display.h"
 
 #include <glib/gi18n.h>
@@ -1200,8 +1199,8 @@ mail_display_frame_created (WebKitWebView *web_view,
 
 static void
 mail_display_set_fonts (EWebView *web_view,
-			PangoFontDescription **monospace,
-			PangoFontDescription **variable)
+                        PangoFontDescription **monospace,
+                        PangoFontDescription **variable)
 {
 	EMailDisplay *display = E_MAIL_DISPLAY (web_view);
 	gboolean use_custom_font;
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index aedabdd3f5..92c40f7bdb 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2282,8 +2282,8 @@ emae_setup_settings (EMAccountEditorService *service)
 		network_settings = CAMEL_NETWORK_SETTINGS (settings);
 
 		/* remember port number as set before binding properties,
-		   because changes in auth-mechanism combo can reset the port,
-		   thus effectively lost it, when set to other known value */
+		 * because changes in auth-mechanism combo can reset the port,
+		 * thus effectively lost it, when set to other known value */
 		port = camel_network_settings_get_port (network_settings);
 
 		/* Even if the service does not need to authenticate, we
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 9c23224c6f..00641d7d30 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1968,10 +1968,10 @@ fail:
 
 static gboolean
 ask_drop_folder (EMFolderTree *folder_tree,
-		 const gchar *src_folder_uri,
-		 const gchar *des_full_name,
-		 CamelStore *des_store,
-		 gboolean is_move)
+                 const gchar *src_folder_uri,
+                 const gchar *des_full_name,
+                 CamelStore *des_store,
+                 gboolean is_move)
 {
 	const gchar *key = is_move ? "prompt-on-folder-drop-move" : "prompt-on-folder-drop-copy";
 	EMailSession *session;
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 5886142d6e..aea13e910b 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -614,7 +614,6 @@ efh_write_image (EMFormat *emf,
 			content = g_base64_encode ((guchar *) buff, len);
 			g_free (buff);
 
-
 		} else {
 			content = g_base64_encode ((guchar *) ba->data, ba->len);
 		}
@@ -2609,7 +2608,9 @@ efh_format_short_headers (EMFormatHTML *efh,
 }
 
 static void
-write_contact_picture (CamelMimePart *part, gint size, GString *buffer)
+write_contact_picture (CamelMimePart *part,
+                       gint size,
+                       GString *buffer)
 {
 	gchar *b64, *content_type;
 	CamelDataWrapper *dw;