Coding style and whitespace cleanup.

8 files changed, 116 insertions, 87 deletions

diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 2099511d62..2e9946d47f 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -57,7 +57,8 @@ fix_color_string (gchar *color_string)
 	if (!gdk_color_parse (color_string, &color))
 		return;
 
-	sprintf (color_string, "#%02x%02x%02x",
+	sprintf (
+		color_string, "#%02x%02x%02x",
 		(gint) color.red * 256 / 65536,
 		(gint) color.green * 256 / 65536,
 		(gint) color.blue * 256 / 65536);
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 7472a50f35..7db1b13b86 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -923,7 +923,6 @@ mail_labels_get_filter_options (gboolean include_none)
 	return g_slist_reverse (list);
 }
 
-
 GSList *
 e_mail_labels_get_filter_options (void)
 {
@@ -938,7 +937,7 @@ e_mail_labels_get_filter_options_without_none (void)
 
 static const gchar *
 get_filter_option_value (EFilterPart *part,
-			 const gchar *name)
+                         const gchar *name)
 {
 	EFilterElement *elem;
 	EFilterOption *opt;
@@ -956,7 +955,7 @@ get_filter_option_value (EFilterPart *part,
 
 static void
 append_one_label_expr (GString *out,
-		       const gchar *versus)
+                       const gchar *versus)
 {
 	GString *encoded;
 
@@ -966,7 +965,8 @@ append_one_label_expr (GString *out,
 	encoded = g_string_new ("");
 	camel_sexp_encode_string (encoded, versus);
 
-	g_string_append_printf (out,
+	g_string_append_printf (
+		out,
 		" (= (user-tag \"label\") %s) (user-flag (+ \"$Label\" %s)) (user-flag %s)",
 		encoded->str, encoded->str, encoded->str);
 
@@ -975,8 +975,8 @@ append_one_label_expr (GString *out,
 
 void
 e_mail_labels_get_filter_code (EFilterElement *element,
-			       GString *out,
-			       EFilterPart *part)
+                               GString *out,
+                               EFilterPart *part)
 {
 	const gchar *label_type, *versus;
 	gboolean is_not;
@@ -1013,7 +1013,7 @@ e_mail_labels_get_filter_code (EFilterElement *element,
 		GtkTreeModel *model;
 		GtkTreeIter iter;
 		gboolean valid;
-		
+
 		shell = e_shell_get_default ();
 		shell_backend = e_shell_get_backend_by_name (shell, "mail");
 
@@ -1072,7 +1072,8 @@ message_parsed_cb (GObject *source_object,
 	soup_session = webkit_get_default_session ();
 	mails = g_object_get_data (G_OBJECT (soup_session), "mails");
 	if (!mails) {
-		mails = g_hash_table_new_full (g_str_hash, g_str_equal,
+		mails = g_hash_table_new_full (
+			g_str_hash, g_str_equal,
 			(GDestroyNotify) g_free, NULL);
 		g_object_set_data (
 			G_OBJECT (soup_session), "mails", mails);
@@ -1099,8 +1100,9 @@ mbox_create_preview_cb (GObject *preview,
 	g_return_if_fail (preview_widget != NULL);
 
 	display = g_object_new (E_TYPE_MAIL_DISPLAY, NULL);
-	g_object_set_data_full (preview, "mbox-imp-display",
-				g_object_ref (display), g_object_unref);
+	g_object_set_data_full (
+		preview, "mbox-imp-display",
+		g_object_ref (display), g_object_unref);
 
 	*preview_widget = GTK_WIDGET (display);
 }
@@ -1126,7 +1128,8 @@ mbox_fill_preview_cb (GObject *preview,
 	mail_session = e_mail_session_new (registry);
 
 	parser = e_mail_parser_new (CAMEL_SESSION (mail_session));
-	e_mail_parser_parse (parser, NULL, msg->message_id, msg,
+	e_mail_parser_parse (
+		parser, NULL, msg->message_id, msg,
 		message_parsed_cb, NULL, preview);
 
 	g_object_unref (mail_session);
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 48f9d74471..123352b181 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -973,7 +973,8 @@ action_mail_smart_backward_cb (GtkAction *action,
 
 	} else {
 
-		gtk_adjustment_set_value (adj,
+		gtk_adjustment_set_value (
+			adj,
 			value - gtk_adjustment_get_page_increment (adj));
 
 		return;
@@ -1059,7 +1060,8 @@ action_mail_smart_forward_cb (GtkAction *action,
 
 	} else {
 
-		gtk_adjustment_set_value (adj,
+		gtk_adjustment_set_value (
+			adj,
 			value + gtk_adjustment_get_page_increment (adj));
 
 		return;
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index e3d7247224..f51f8f1005 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -488,8 +488,9 @@ mail_shell_view_load_view_collection (EShellViewClass *shell_view_class)
 	spec = e_table_specification_new ();
 	filename = g_build_filename (base_dir, ETSPEC_FILENAME, NULL);
 	if (!e_table_specification_load_from_file (spec, filename))
-		g_critical ("Unable to load ETable specification file "
-			    "for mail");
+		g_critical (
+			"Unable to load ETable specification file "
+			"for mail");
 	g_free (filename);
 
 	factory = gal_view_factory_etable_new (spec);
@@ -1068,8 +1069,8 @@ typedef struct {
 
 static gboolean
 send_receive_can_use_service (EMailAccountStore *account_store,
-			      CamelService *service,
-			      GtkTreeIter *piter)
+                              CamelService *service,
+                              GtkTreeIter *piter)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -1089,7 +1090,8 @@ send_receive_can_use_service (EMailAccountStore *account_store,
 		do {
 			adept = NULL;
 
-			gtk_tree_model_get (model, &iter,
+			gtk_tree_model_get (
+				model, &iter,
 				E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE, &adept,
 				-1);
 
@@ -1107,7 +1109,8 @@ send_receive_can_use_service (EMailAccountStore *account_store,
 	if (!found)
 		return FALSE;
 
-	gtk_tree_model_get (model, &iter,
+	gtk_tree_model_get (
+		model, &iter,
 		E_MAIL_ACCOUNT_STORE_COLUMN_ENABLED, &enabled,
 		E_MAIL_ACCOUNT_STORE_COLUMN_BUILTIN, &builtin,
 		-1);
@@ -1180,16 +1183,16 @@ send_receive_add_to_menu (SendReceiveData *data,
 
 static void
 send_receive_gather_services (gpointer menu_item,
-			      gpointer service,
-			      gpointer queue)
+                              gpointer service,
+                              gpointer queue)
 {
 	g_queue_push_head (queue, service);
 }
 
 static gint
 sort_services_cb (gconstpointer service1,
-		  gconstpointer service2,
-		  gpointer account_store)
+                  gconstpointer service2,
+                  gpointer account_store)
 {
 	return e_mail_account_store_compare_services (account_store, CAMEL_SERVICE (service1), CAMEL_SERVICE (service2));
 }
@@ -1363,7 +1366,8 @@ create_send_receive_submenu (EMailShellView *mail_shell_view)
 		do {
 			service = NULL;
 
-			gtk_tree_model_get (model, &iter,
+			gtk_tree_model_get (
+				model, &iter,
 				E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE, &service,
 				-1);
 
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index ebbbcef65f..801362d331 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -46,9 +46,9 @@ static const gchar *SEARCH_RESULTS_STATE =
 
 static void
 add_folders_from_store (GList **folders,
-			CamelStore *store,
-			GCancellable *cancellable,
-			GError **error)
+                        CamelStore *store,
+                        GCancellable *cancellable,
+                        GError **error)
 {
 	CamelFolderInfo *root, *fi;
 
@@ -771,7 +771,8 @@ has_unread_mail (GtkTreeModel *model,
 	if (is_root) {
 		gboolean is_store = FALSE, is_draft = FALSE;
 
-		gtk_tree_model_get (model, parent,
+		gtk_tree_model_get (
+			model, parent,
 			COL_UINT_UNREAD, &unread,
 			COL_BOOL_IS_STORE, &is_store,
 			COL_BOOL_IS_DRAFT, &is_draft,
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 58700f26b1..3a092efe49 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -348,7 +348,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	 *
 	 * The mail composer preferences settings page.
 	 */
-	ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.composerPrefs");
+	ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.composerPrefs");
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emcp_items); i++)
 		l = g_slist_prepend (l, &emcp_items[i]);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 1877e28624..4720470c2a 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -242,7 +242,7 @@ jh_add_cb (GtkWidget *widget,
 		tok = g_strdup_printf ("%s=%s", name, value);
 		g_ptr_array_add (array, tok);
 		g_ptr_array_add (array, NULL);
-		g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata);
+		g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const *) array->pdata);
 
 		g_ptr_array_free (array, TRUE);
 		g_strfreev (strv);
@@ -290,7 +290,7 @@ jh_remove_cb (GtkWidget *widget,
 
 		g_ptr_array_add (array, NULL);
 
-		g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata);
+		g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const *) array->pdata);
 
 		g_strfreev (strv);
 		g_ptr_array_free (array, TRUE);
@@ -337,9 +337,10 @@ emmp_header_remove_sensitivity (EMMailerPrefs *prefs)
 	 * disabled
 	*/
 	if (gtk_tree_selection_get_selected (selection, NULL, &iter)) {
-		gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
-				    HEADER_LIST_IS_DEFAULT_COLUMN, &is_default,
-				    -1);
+		gtk_tree_model_get (
+			GTK_TREE_MODEL (prefs->header_list_store), &iter,
+			HEADER_LIST_IS_DEFAULT_COLUMN, &is_default,
+			-1);
 		if (is_default)
 			gtk_widget_set_sensitive (GTK_WIDGET (prefs->remove_header), FALSE);
 		else
@@ -384,9 +385,10 @@ emmp_header_add_sensitivity (EMMailerPrefs *prefs)
 	while (valid) {
 		gchar *header_name;
 
-		gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
-				    HEADER_LIST_HEADER_COLUMN, &header_name,
-				    -1);
+		gtk_tree_model_get (
+			GTK_TREE_MODEL (prefs->header_list_store), &iter,
+			HEADER_LIST_HEADER_COLUMN, &header_name,
+			-1);
 		if (g_ascii_strcasecmp (header_name, entry_contents) == 0) {
 			gtk_widget_set_sensitive (GTK_WIDGET (prefs->add_header), FALSE);
 			g_free (header_name);
@@ -418,10 +420,11 @@ emmp_save_headers (EMMailerPrefs *prefs)
 
 		h.name = NULL;
 
-		gtk_tree_model_get (GTK_TREE_MODEL (prefs->header_list_store), &iter,
-				    HEADER_LIST_HEADER_COLUMN, &h.name,
-				    HEADER_LIST_ENABLED_COLUMN, &enabled,
-				    -1);
+		gtk_tree_model_get (
+			GTK_TREE_MODEL (prefs->header_list_store), &iter,
+			HEADER_LIST_HEADER_COLUMN, &h.name,
+			HEADER_LIST_ENABLED_COLUMN, &enabled,
+			-1);
 		h.enabled = enabled;
 
 		if ((xml = e_mail_reader_header_to_xml (&h)))
@@ -450,10 +453,13 @@ emmp_header_list_enabled_toggled (GtkCellRendererToggle *cell,
 	gint enabled;
 
 	gtk_tree_model_get_iter (model, &iter, path);
-	gtk_tree_model_get (model, &iter, HEADER_LIST_ENABLED_COLUMN, &enabled, -1);
+	gtk_tree_model_get (
+		model, &iter,
+		HEADER_LIST_ENABLED_COLUMN, &enabled, -1);
 	enabled = !enabled;
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter, HEADER_LIST_ENABLED_COLUMN,
-			    enabled, -1);
+	gtk_list_store_set (
+		GTK_LIST_STORE (model), &iter,
+		HEADER_LIST_ENABLED_COLUMN, enabled, -1);
 	gtk_tree_path_free (path);
 
 	emmp_save_headers (prefs);
@@ -471,12 +477,13 @@ emmp_header_add_header (GtkWidget *widget,
 
 	if (text && (strlen (text) > 0)) {
 		gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-				HEADER_LIST_NAME_COLUMN, text,
-				HEADER_LIST_ENABLED_COLUMN, TRUE,
-				HEADER_LIST_HEADER_COLUMN, text,
-				HEADER_LIST_IS_DEFAULT_COLUMN, FALSE,
-				-1);
+		gtk_list_store_set (
+			GTK_LIST_STORE (model), &iter,
+			HEADER_LIST_NAME_COLUMN, text,
+			HEADER_LIST_ENABLED_COLUMN, TRUE,
+			HEADER_LIST_HEADER_COLUMN, text,
+			HEADER_LIST_IS_DEFAULT_COLUMN, FALSE,
+			-1);
 		gtk_entry_set_text (prefs->entry_header, "");
 		emmp_header_remove_sensitivity (prefs);
 		emmp_header_add_sensitivity (prefs);
@@ -491,9 +498,11 @@ emmp_header_remove_header (GtkWidget *button,
 {
 	EMMailerPrefs *prefs = (EMMailerPrefs *) user_data;
 	GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store);
-	GtkTreeSelection *selection = gtk_tree_view_get_selection (prefs->header_list);
+	GtkTreeSelection *selection;
 	GtkTreeIter iter;
 
+	selection = gtk_tree_view_get_selection (prefs->header_list);
+
 	if (!gtk_tree_selection_get_selected (selection, NULL, &iter))
 		return;
 
@@ -528,7 +537,9 @@ toggle_button_toggled (GtkToggleButton *toggle,
 	const gchar *key;
 
 	key = g_object_get_data ((GObject *) toggle, "key");
-	g_settings_set_boolean (prefs->settings, key, gtk_toggle_button_get_active (toggle));
+	g_settings_set_boolean (
+		prefs->settings, key,
+		gtk_toggle_button_get_active (toggle));
 }
 
 static void
@@ -536,7 +547,9 @@ junk_book_lookup_button_toggled (GtkToggleButton *toggle,
                                  EMMailerPrefs *prefs)
 {
 	toggle_button_toggled (toggle, prefs);
-	gtk_widget_set_sensitive (GTK_WIDGET (prefs->junk_lookup_local_only), gtk_toggle_button_get_active (toggle));
+	gtk_widget_set_sensitive (
+		GTK_WIDGET (prefs->junk_lookup_local_only),
+		gtk_toggle_button_get_active (toggle));
 }
 
 static void
@@ -614,7 +627,8 @@ emmp_empty_trash_init (EMMailerPrefs *prefs,
 			hist = ii;
 
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
+		gtk_list_store_set (
+			store, &iter,
 			0,  gettext (empty_trash_frequency[ii].label),
 			-1);
 	}
@@ -662,7 +676,8 @@ emmp_empty_junk_init (EMMailerPrefs *prefs,
 			hist = ii;
 
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter,
+		gtk_list_store_set (
+			store, &iter,
 			0, gettext (empty_trash_frequency[ii].label),
 			-1);
 	}
@@ -771,7 +786,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	 *
 	 * The main mail preferences page.
 	 */
-	ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.prefs");
+	ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.prefs");
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emmp_items); i++)
 		l = g_slist_prepend (l, &emmp_items[i]);
@@ -1043,15 +1058,17 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	g_signal_connect (
 		renderer, "toggled",
 		G_CALLBACK (emmp_header_list_enabled_toggled), prefs);
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (prefs->header_list), -1,
-						     "Enabled", renderer,
-						     "active", HEADER_LIST_ENABLED_COLUMN,
-						     NULL);
+	gtk_tree_view_insert_column_with_attributes (
+		GTK_TREE_VIEW (prefs->header_list), -1,
+		"Enabled", renderer,
+		"active", HEADER_LIST_ENABLED_COLUMN,
+		NULL);
 	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (prefs->header_list), -1,
-						     "Name", renderer,
-						     "text", HEADER_LIST_NAME_COLUMN,
-						     NULL);
+	gtk_tree_view_insert_column_with_attributes (
+		GTK_TREE_VIEW (prefs->header_list), -1,
+		"Name", renderer,
+		"text", HEADER_LIST_NAME_COLUMN,
+		NULL);
 
 	/* populated the listview with entries; firstly we add all the default headers, and then
 	 * we add read header configuration out of settings. If a header in settings is a default header,
@@ -1065,7 +1082,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		h = g_malloc (sizeof (EMailReaderHeader));
 		h->is_default = TRUE;
 		h->name = g_strdup (default_headers[i]);
-		h->enabled = strcmp ((gchar *)default_headers[i], "x-evolution-mailer") != 0;
+		h->enabled = strcmp ((gchar *) default_headers[i], "x-evolution-mailer") != 0;
 		g_hash_table_insert (default_header_hash, (gpointer) default_headers[i], h);
 		header_add_list = g_slist_append (header_add_list, h);
 	}
@@ -1106,12 +1123,13 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 			name = _(h->name);
 
 		gtk_list_store_append (prefs->header_list_store, &iter);
-		gtk_list_store_set (prefs->header_list_store, &iter,
-				    HEADER_LIST_NAME_COLUMN, name,
-				    HEADER_LIST_ENABLED_COLUMN, h->enabled,
-				    HEADER_LIST_IS_DEFAULT_COLUMN, h->is_default,
-				    HEADER_LIST_HEADER_COLUMN, h->name,
-				    -1);
+		gtk_list_store_set (
+			prefs->header_list_store, &iter,
+			HEADER_LIST_NAME_COLUMN, name,
+			HEADER_LIST_ENABLED_COLUMN, h->enabled,
+			HEADER_LIST_IS_DEFAULT_COLUMN, h->is_default,
+			HEADER_LIST_HEADER_COLUMN, h->name,
+			-1);
 
 		e_mail_reader_header_free (h);
 		p = p->next;
@@ -1159,12 +1177,12 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	widget = e_builder_get_widget (prefs->builder, "junk-module-options");
 	e_mail_junk_options_set_session (E_MAIL_JUNK_OPTIONS (widget), session);
 
-	prefs->junk_header_check = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "junk_header_check");
-	prefs->junk_header_tree = (GtkTreeView *)e_builder_get_widget (prefs->builder, "junk_header_tree");
-	prefs->junk_header_add = (GtkButton *)e_builder_get_widget (prefs->builder, "junk_header_add");
-	prefs->junk_header_remove = (GtkButton *)e_builder_get_widget (prefs->builder, "junk_header_remove");
-	prefs->junk_book_lookup = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "lookup_book");
-	prefs->junk_lookup_local_only = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "junk_lookup_local_only");
+	prefs->junk_header_check = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "junk_header_check");
+	prefs->junk_header_tree = (GtkTreeView *) e_builder_get_widget (prefs->builder, "junk_header_tree");
+	prefs->junk_header_add = (GtkButton *) e_builder_get_widget (prefs->builder, "junk_header_add");
+	prefs->junk_header_remove = (GtkButton *) e_builder_get_widget (prefs->builder, "junk_header_remove");
+	prefs->junk_book_lookup = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "lookup_book");
+	prefs->junk_lookup_local_only = (GtkToggleButton *) e_builder_get_widget (prefs->builder, "junk_lookup_local_only");
 	toggle_button_init (
 		prefs, prefs->junk_book_lookup,
 		FALSE, "junk-lookup-addressbook",
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 3a7b335191..b43c8a169f 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -119,7 +119,7 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs,
 #if 0
 	if (type == NETWORK_PROXY_AUTOCONFIG) {
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity);
-		d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
+		d (g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
 	} else
 #endif
 	if (type == NETWORK_PROXY_MANUAL) {
@@ -147,7 +147,7 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs,
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auth_user, state);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auth_pwd, state);
 
-		d(g_print ("Setting sensitivity of manual proxy to: %d\n", sensitivity));
+		d (g_print ("Setting sensitivity of manual proxy to: %d\n", sensitivity));
 	}
 }
 
@@ -211,11 +211,11 @@ widget_entry_changed_cb (GtkWidget *widget,
 	if (GTK_IS_SPIN_BUTTON (widget)) {
 		port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
 		g_settings_set_int (proxy_settings, key, port);
-		d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, key, port));
+		d (g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, key, port));
 	} else if (GTK_IS_ENTRY (widget)) {
 		value = gtk_entry_get_text (GTK_ENTRY (widget));
 		g_settings_set_string (proxy_settings, key, value);
-		d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, key, value));
+		d (g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, key, value));
 	}
 }
 
@@ -331,7 +331,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	 *
 	 * The network preferences settings page.
 	 */
-	ec = em_config_new(E_CONFIG_BOOK, "org.gnome.evolution.mail.networkPrefs");
+	ec = em_config_new (E_CONFIG_BOOK, "org.gnome.evolution.mail.networkPrefs");
 	l = NULL;
 	for (i = 0; i < G_N_ELEMENTS (emnp_items); i++)
 		l = g_slist_prepend (l, &emnp_items[i]);
@@ -353,14 +353,14 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->sys_proxy, FALSE);
 
-	d(g_print ("Sys settings ----!!! \n"));
+	d (g_print ("Sys settings ----!!! \n"));
 
 	prefs->no_proxy = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "rdoNoProxy"));
 	gtk_toggle_button_set_active (prefs->no_proxy, val == NETWORK_PROXY_DIRECT_CONNECTION);
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->no_proxy, FALSE);
 
-	d(g_print ("No proxy settings ----!!! \n"));
+	d (g_print ("No proxy settings ----!!! \n"));
 
 	/* no auto-proxy at the moment */
 #if 0
@@ -377,7 +377,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy, FALSE);
 #endif
 
-	d(g_print ("Auto config settings ----!!! \n"));
+	d (g_print ("Auto config settings ----!!! \n"));
 
 	prefs->manual_proxy = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "rdoManualProxy"));
 	prefs->http_host = GTK_ENTRY (e_builder_get_widget (prefs->builder, "txtHttpHost"));
@@ -466,7 +466,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 
 	if (locked)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->manual_proxy, FALSE);
-	d(g_print ("Manual settings ----!!! \n"));
+	d (g_print ("Manual settings ----!!! \n"));
 
 	buf = g_settings_get_string (prefs->proxy_settings, "http-host");
 	gtk_entry_set_text (prefs->http_host, buf ? buf : "");