Coding style and whitespace cleanup.

6 files changed, 42 insertions, 20 deletions

diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 2cc03ad23c..f088b9f805 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -147,9 +147,13 @@ mail_store_note_store_cb (CamelStore *store,
 	if (!store_info->removed) {
 		/* This keeps message counters up-to-date. */
 		if (store_info->vtrash != NULL)
-			mail_folder_cache_note_folder (mail_folder_cache_get_default (), store_info->vtrash);
+			mail_folder_cache_note_folder (
+				mail_folder_cache_get_default (),
+				store_info->vtrash);
 		if (store_info->vjunk != NULL)
-			mail_folder_cache_note_folder (mail_folder_cache_get_default (), store_info->vjunk);
+			mail_folder_cache_note_folder (
+				mail_folder_cache_get_default (),
+				store_info->vjunk);
 	}
 
 	store_info_unref (store_info);
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index aa72175111..09c0ee15b1 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -331,7 +331,9 @@ part_combobox_changed (GtkComboBox *combobox, struct _part_data *data)
 	gint index, i;
 
 	index = gtk_combo_box_get_active (combobox);
-	for (i = 0, part = em_filter_context_next_action (data->f, part); part && i < index; i++, part = em_filter_context_next_action (data->f, part)) {
+	for (i = 0, part = em_filter_context_next_action (data->f, part);
+		part && i < index;
+		i++, part = em_filter_context_next_action (data->f, part)) {
 		/* traverse until reached index */
 	}
 
@@ -557,8 +559,9 @@ get_widget(EFilterRule *fr, ERuleContext *rc)
 	hbox = gtk_hbox_new(FALSE, 3);
 
 	add = gtk_button_new_with_mnemonic (_("Add Ac_tion"));
-	gtk_button_set_image (GTK_BUTTON (add), gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON));
-	/* gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE); */
+	gtk_button_set_image (
+		GTK_BUTTON (add), gtk_image_new_from_stock (
+		GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON));
 	g_signal_connect(add, "clicked", G_CALLBACK(more_parts), data);
 	gtk_box_pack_start(GTK_BOX(hbox), add, FALSE, FALSE, 0);
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index c0840434c1..c79b4b4707 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -209,7 +209,9 @@ account_changed_cb (EAccountList *accounts,
 	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 
-	if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
+	store = (CamelStore *) camel_session_get_service (
+		session, uri, CAMEL_PROVIDER_STORE, &ex);
+	if (store == NULL) {
 		camel_exception_clear (&ex);
 		return;
 	}
@@ -601,7 +603,8 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 	tree_store = GTK_TREE_STORE (model);
 
 	if (!fully_loaded)
-		load = fi->child == NULL && !(fi->flags & (CAMEL_FOLDER_NOCHILDREN | CAMEL_FOLDER_NOINFERIORS));
+		load = (fi->child == NULL) && !(fi->flags &
+			(CAMEL_FOLDER_NOCHILDREN | CAMEL_FOLDER_NOINFERIORS));
 
 	path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), iter);
 	uri_row = gtk_tree_row_reference_new (GTK_TREE_MODEL (model), path);
@@ -613,12 +616,14 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 	g_hash_table_insert (
 		si->full_hash, g_strdup (fi->full_name), path_row);
 
-	/* HACK: if we have the folder, and its the outbox folder, we need the total count, not unread */
-	/* HACK2: We do the same to the draft folder */
-	/* This is duplicated in mail-folder-cache too, should perhaps be functionised */
+	/* XXX If we have the folder, and its the Outbox folder, we need
+	 *     the total count, not unread.  We do the same for Drafts. */
+
+	/* XXX This is duplicated in mail-folder-cache too, should perhaps
+	 *     be functionised. */
 	unread = fi->unread;
-	if (mail_folder_cache_get_folder_from_uri(mail_folder_cache_get_default (),
-						fi->uri, &folder) && folder) {
+	if (mail_folder_cache_get_folder_from_uri (
+		mail_folder_cache_get_default (), fi->uri, &folder) && folder) {
 		is_drafts = em_utils_folder_is_drafts (folder, fi->uri);
 
 		if (is_drafts || em_utils_folder_is_outbox (folder, fi->uri)) {
@@ -637,7 +642,8 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 		camel_object_unref(folder);
 	}
 
-	/* TODO: maybe this should be handled by mail_get_folderinfo (except em-folder-tree doesn't use it, duh) */
+	/* TODO Maybe this should be handled by mail_get_folderinfo
+	 *      (except em-folder-tree doesn't use it, duh) */
 	flags = fi->flags;
 	name = fi->name;
 	if (si->store == e_mail_local_get_store ()) {
@@ -700,8 +706,12 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
 		COL_BOOL_IS_DRAFT, is_drafts,
 		-1);
 
-	target = em_event_target_new_custom_icon (em_event_peek(), tree_store, iter, fi->full_name, EM_EVENT_CUSTOM_ICON);
-	e_event_emit ((EEvent *)em_event_peek (), "folder.customicon", (EEventTarget *) target);
+	target = em_event_target_new_custom_icon (
+		em_event_peek (), tree_store, iter,
+		fi->full_name, EM_EVENT_CUSTOM_ICON);
+	e_event_emit (
+		(EEvent *) em_event_peek (), "folder.customicon",
+		(EEventTarget *) target);
 
 	if (unread != ~0)
 		gtk_tree_store_set (
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index c2d45a25f6..e18da4535d 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -302,7 +302,9 @@ mail_importer_elm_import(EImport *ei, EImportTarget *target)
 static void
 checkbox_toggle_cb (GtkToggleButton *tb, EImportTarget *target)
 {
-	g_datalist_set_data(&target->data, "elm-do-mail", GINT_TO_POINTER(gtk_toggle_button_get_active(tb)));
+	g_datalist_set_data (
+		&target->data, "elm-do-mail",
+		GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
 }
 
 static GtkWidget *
@@ -313,10 +315,12 @@ elm_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 	gboolean done_mail;
 
 	gconf = gconf_client_get_default ();
-	done_mail = gconf_client_get_bool (gconf, "/apps/evolution/importer/elm/mail", NULL);
+	done_mail = gconf_client_get_bool (
+		gconf, "/apps/evolution/importer/elm/mail", NULL);
 	g_object_unref(gconf);
 
-	g_datalist_set_data(&target->data, "elm-do-mail", GINT_TO_POINTER(!done_mail));
+	g_datalist_set_data (
+		&target->data, "elm-do-mail", GINT_TO_POINTER(!done_mail));
 
 	box = gtk_vbox_new(FALSE, 2);
 
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 01129471ae..2cd8c9864f 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -230,7 +230,9 @@ mbox_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 	importer->cancel = camel_operation_new(mbox_status, importer);
 
 	filename = g_filename_from_uri(((EImportTargetURI *)target)->uri_src, NULL, NULL);
-	mail_importer_import_mbox(filename, ((EImportTargetURI *)target)->uri_dest, importer->cancel, mbox_import_done, importer);
+	mail_importer_import_mbox (
+		filename, ((EImportTargetURI *)target)->uri_dest,
+		importer->cancel, mbox_import_done, importer);
 	g_free(filename);
 }
 
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 0341b5f050..a985aef6b8 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -428,7 +428,6 @@ lookup_addressbook(CamelSession *session, const gchar *name)
 static gboolean
 alert_user(CamelSession *session, CamelSessionAlertType type, const gchar *prompt, gboolean cancel)
 {
-	MailSession *mail_session = MAIL_SESSION (session);
 	struct _user_message_msg *m;
 	gboolean result = TRUE;