Coding style and whitespace cleanup.

5 files changed, 18 insertions, 10 deletions

diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 06d9dd1f2f..65633da097 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -381,6 +381,7 @@ mail_backend_constructed (GObject *object)
 	EShellBackend *shell_backend;
 	MailFolderCache *folder_cache;
 	const gchar *data_dir;
+	gboolean online;
 
 	shell_backend = E_SHELL_BACKEND (object);
 	shell = e_shell_backend_get_shell (shell_backend);
@@ -388,7 +389,8 @@ mail_backend_constructed (GObject *object)
 	/* This also initializes Camel, so it needs to happen early. */
 	mail_session_init ();
 
-	camel_session_set_online ((CamelSession *) session, e_shell_get_online (shell));
+	online = e_shell_get_online (shell);
+	camel_session_set_online (CAMEL_SESSION (session), online);
 	e_account_combo_box_set_session (session);  /* XXX Don't ask... */
 
 	folder_cache = mail_folder_cache_get_default ();
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 9b7cc4d887..74b4f1a427 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -808,15 +808,22 @@ action_mail_save_as_cb (GtkAction *action,
 	}
 
 	if (!suggestion) {
-		/* To Translators: This is a part of a suggested file name used when saving
-		   a message or multiple messages to an mbox format, when the first message
-		   doesn't have a Subject. The extension ".mbox" is appended to this string,
-		   thus it will be something like "Message.mbox" at the end. */
-		suggestion = g_strconcat (ngettext ("Message", "Messages", uids->len), ".mbox", NULL);
+		const gchar *basename;
+
+		/* Translators: This is a part of a suggested file name
+		 * used when saving a message or multiple messages to an
+		 * mbox format, when the first message doesn't have a
+		 * Subject. The extension ".mbox" is appended to this
+		 * string, thus it will be something like "Message.mbox"
+		 * at the end. */
+		basename = ngettext ("Message", "Messages", uids->len);
+		suggestion = g_strconcat (basename, ".mbox", NULL);
 	}
 
 	shell = e_shell_backend_get_shell (shell_backend);
-	file = e_shell_run_save_dialog (shell, title, suggestion, "*.mbox:application/mbox,message/rfc822", NULL, NULL);
+	file = e_shell_run_save_dialog (
+		shell, title, suggestion,
+		"*.mbox:application/mbox,message/rfc822", NULL, NULL);
 
 	if (file == NULL) {
 		em_utils_uids_free (uids);
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 4752accc75..88912a4517 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2477,7 +2477,7 @@ emae_receive_options_item (EConfig *ec, EConfigItem *item, GtkWidget *parent, Gt
 			GtkWidget *box = gtk_hbox_new (FALSE, 12);
 			gtk_widget_reparent (old, box);
 			gtk_widget_show(box);
-			gtk_box_set_child_packing ((GtkBox *)box, old, TRUE, TRUE, 12, GTK_PACK_START);			
+			gtk_box_set_child_packing ((GtkBox *)box, old, TRUE, TRUE, 12, GTK_PACK_START);
 			gtk_box_pack_end ((GtkBox *)emae->pages[2], box, FALSE, FALSE, 0);
 		}
 		return old;
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 0d64a5cbf3..63d323430f 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2167,7 +2167,6 @@ em_utils_guess_account_with_recipients (CamelMimeMessage *message, CamelFolder *
 	if (addr)
 		recipients = g_list_append (recipients, (gpointer) addr);
 
-
 	/* finally recipient (to/cc) in account table */
 	account_hash = em_utils_generate_account_hash ();
 	for (l = recipients; l == NULL; l = l->next) {
diff --git a/mail/message-list.h b/mail/message-list.h
index e239944783..953a444e11 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -196,7 +196,7 @@ GPtrArray *	message_list_get_selected	(MessageList *message_list);
 void		message_list_set_selected	(MessageList *message_list,
 						 GPtrArray *uids);
 gboolean	message_list_select		(MessageList *message_list,
-					 	 MessageListSelectDirection direction,
+						 MessageListSelectDirection direction,
 						 guint32 flags,
 						 guint32 mask);
 gboolean	message_list_can_select		(MessageList *message_list,