Miscellaneous cleanups.

4 files changed, 44 insertions, 28 deletions

diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index ed8efb72b1..673893ca87 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -160,6 +160,7 @@ mail_label_list_store_finalize (GObject *object)
 	priv = E_MAIL_LABEL_LIST_STORE (object)->priv;
 
 	g_hash_table_destroy (priv->tag_index);
+
 	if (priv->mail_settings != NULL) {
 		g_object_unref (priv->mail_settings);
 		priv->mail_settings = NULL;
@@ -250,19 +251,24 @@ mail_label_list_store_constructed (GObject *object)
 
 	/* Connect to GSettings' change notifications */
 	store->priv->mail_settings = g_settings_new ("org.gnome.evolution.mail");
-	g_signal_connect (store->priv->mail_settings, "changed::labels",
-			  G_CALLBACK (labels_settings_changed_cb), store);
+	g_signal_connect (
+		store->priv->mail_settings, "changed::labels",
+		G_CALLBACK (labels_settings_changed_cb), store);
 	labels_settings_changed_cb (store->priv->mail_settings, "labels", store);
 
 	/* Connect to ListStore change notifications */
-	g_signal_connect (store, "row-inserted",
-			  G_CALLBACK (labels_model_changed_cb), store);
-	g_signal_connect (store, "row-changed",
-			  G_CALLBACK (labels_model_changed_cb), store);
-	g_signal_connect (store, "row-deleted",
-			  G_CALLBACK (labels_model_changed_cb), store);
-	g_signal_connect (store, "rows-reordered",
-			  G_CALLBACK (labels_model_changed_cb), store);
+	g_signal_connect (
+		store, "row-inserted",
+		G_CALLBACK (labels_model_changed_cb), store);
+	g_signal_connect (
+		store, "row-changed",
+		G_CALLBACK (labels_model_changed_cb), store);
+	g_signal_connect (
+		store, "row-deleted",
+		G_CALLBACK (labels_model_changed_cb), store);
+	g_signal_connect (
+		store, "rows-reordered",
+		G_CALLBACK (labels_model_changed_cb), store);
 
 	mail_label_list_store_ensure_defaults (store);
 
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 4f863af242..1169b1d461 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -1321,7 +1321,9 @@ e_mail_session_init (EMailSession *session)
 	camel_session_set_check_junk (
 		CAMEL_SESSION (session), g_settings_get_boolean (
 		settings, "junk-check-incoming"));
-	g_signal_connect (settings, "changed", G_CALLBACK (mail_session_check_junk_notify), session);
+	g_signal_connect (
+		settings, "changed",
+		G_CALLBACK (mail_session_check_junk_notify), session);
 
 	mail_config_reload_junk_headers (session);
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index a3be92d4c0..c15f8b67b5 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -165,9 +165,10 @@ em_utils_prompt_user (GtkWindow *parent,
 
 	button = gtk_dialog_run (GTK_DIALOG (dialog));
 	if (promptkey)
-		g_settings_set_boolean (settings, promptkey,
-					!gtk_toggle_button_get_active (
-						GTK_TOGGLE_BUTTON (check)));
+		g_settings_set_boolean (
+			settings, promptkey,
+			!gtk_toggle_button_get_active (
+				GTK_TOGGLE_BUTTON (check)));
 
 	gtk_widget_destroy (dialog);
 
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 1e628035a1..89c26eaaa5 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -253,34 +253,41 @@ mail_config_init (EMailSession *session)
 	/* Composer Configuration */
 
 	settings_outlook_filenames_changed (mail_settings, NULL, NULL);
-	g_signal_connect (mail_settings, "changed::composer-outlook-filenames",
-			  G_CALLBACK (settings_outlook_filenames_changed), NULL);
+	g_signal_connect (
+		mail_settings, "changed::composer-outlook-filenames",
+		G_CALLBACK (settings_outlook_filenames_changed), NULL);
 
 	/* Display Configuration */
 
-	g_signal_connect (mail_settings, "changed::address-compress",
-			  G_CALLBACK (settings_bool_value_changed), &config->address_compress);
+	g_signal_connect (
+		mail_settings, "changed::address-compress",
+		G_CALLBACK (settings_bool_value_changed), &config->address_compress);
 	config->address_compress = g_settings_get_boolean (mail_settings, "address-compress");
 
-	g_signal_connect (mail_settings, "changed::address-count",
-			  G_CALLBACK (settings_int_value_changed), &config->address_count);
+	g_signal_connect (
+		mail_settings, "changed::address-count",
+		G_CALLBACK (settings_int_value_changed), &config->address_count);
 	config->address_count = g_settings_get_int (mail_settings, "address-count");
 
 	/* Junk Configuration */
 
-	g_signal_connect (mail_settings, "changed::junk-check-custom-header",
-			  G_CALLBACK (settings_jh_check_changed), session);
+	g_signal_connect (
+		mail_settings, "changed::junk-check-custom-header",
+		G_CALLBACK (settings_jh_check_changed), session);
 	config->jh_check = g_settings_get_boolean (mail_settings, "junk-check-custom-header");
 
-	g_signal_connect (mail_settings, "changed::junk-custom-header",
-			  G_CALLBACK (settings_jh_headers_changed), session);
+	g_signal_connect (
+		mail_settings, "changed::junk-custom-header",
+		G_CALLBACK (settings_jh_headers_changed), session);
 
-	g_signal_connect (mail_settings, "changed::junk-lookup-addressbook",
-			  G_CALLBACK (settings_bool_value_changed), &config->book_lookup);
+	g_signal_connect (
+		mail_settings, "changed::junk-lookup-addressbook",
+		G_CALLBACK (settings_bool_value_changed), &config->book_lookup);
 	config->book_lookup = g_settings_get_boolean (mail_settings, "junk-lookup-addressbook");
 
-	g_signal_connect (mail_settings, "changed::junk-lookup-addressbook-local-only",
-			  G_CALLBACK (settings_bool_value_changed), &config->book_lookup_local_only);
+	g_signal_connect (
+		mail_settings, "changed::junk-lookup-addressbook-local-only",
+		G_CALLBACK (settings_bool_value_changed), &config->book_lookup_local_only);
 	config->book_lookup_local_only = g_settings_get_boolean (mail_settings, "junk-lookup-addressbook-local-only");
 
 	settings_jh_check_changed (mail_settings, NULL, session);