Coding style and whitespace cleanup.

6 files changed, 39 insertions, 37 deletions

diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index 031efab150..e545fa2566 100644
--- a/modules/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
@@ -66,7 +66,7 @@ void		e_mail_shell_backend_register_type
 					(GTypeModule *type_module);
 
 /* XXX Find a better place for this function. */
-GSList *	e_mail_labels_get_filter_options(void);
+GSList *	e_mail_labels_get_filter_options (void);
 
 G_END_DECLS
 
diff --git a/modules/mail/e-mail-shell-content.h b/modules/mail/e-mail-shell-content.h
index 6e2c721d59..58f7ee9fd2 100644
--- a/modules/mail/e-mail-shell-content.h
+++ b/modules/mail/e-mail-shell-content.h
@@ -65,7 +65,8 @@ struct _EMailShellContentClass {
 GType		e_mail_shell_content_get_type	(void);
 void		e_mail_shell_content_register_type
 					(GTypeModule *type_module);
-GtkWidget *	e_mail_shell_content_new(EShellView *shell_view);
+GtkWidget *	e_mail_shell_content_new
+					(EShellView *shell_view);
 EMailView *	e_mail_shell_content_get_mail_view
 					(EMailShellContent *mail_shell_content);
 EShellSearchbar *
diff --git a/modules/mail/e-mail-shell-sidebar.h b/modules/mail/e-mail-shell-sidebar.h
index b27bd80be0..ca3a43654d 100644
--- a/modules/mail/e-mail-shell-sidebar.h
+++ b/modules/mail/e-mail-shell-sidebar.h
@@ -63,7 +63,8 @@ struct _EMailShellSidebarClass {
 GType		e_mail_shell_sidebar_get_type	(void);
 void		e_mail_shell_sidebar_register_type
 					(GTypeModule *type_module);
-GtkWidget *	e_mail_shell_sidebar_new(EShellView *shell_view);
+GtkWidget *	e_mail_shell_sidebar_new
+					(EShellView *shell_view);
 EMFolderTree *	e_mail_shell_sidebar_get_folder_tree
 					(EMailShellSidebar *mail_shell_sidebar);
 
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 7db5238a62..584936cb67 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -398,8 +398,8 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	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]);
-	e_config_add_items((EConfig *)ec, l, NULL, NULL, emcp_free, prefs);
+		l = g_slist_prepend (l, &emcp_items[i]);
+	e_config_add_items ((EConfig *)ec, l, NULL, NULL, emcp_free, prefs);
 
 	/* General tab */
 
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 751c395223..ecc794ebf6 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -651,11 +651,11 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs)
 }
 
 static GtkWidget *
-emmp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+emmp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMMailerPrefs *prefs = data;
 
-	return e_builder_get_widget(prefs->builder, item->label);
+	return e_builder_get_widget (prefs->builder, item->label);
 }
 
 /* plugin meta-data */
@@ -679,18 +679,18 @@ static EMConfigItem emmp_items[] = {
 };
 
 static void
-emmp_free(EConfig *ec, GSList *items, gpointer data)
+emmp_free (EConfig *ec, GSList *items, gpointer data)
 {
 	/* the prefs data is freed automagically */
 
-	g_slist_free(items);
+	g_slist_free (items);
 }
 
 static void
 junk_plugin_changed (GtkWidget *combo, EMMailerPrefs *prefs)
 {
-	gchar *def_plugin = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo));
-	const GList *plugins = mail_session_get_junk_plugins();
+	gchar *def_plugin = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo));
+	const GList *plugins = mail_session_get_junk_plugins ();
 
 	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/junk/default_plugin", def_plugin, NULL);
 	while (plugins) {
@@ -731,7 +731,7 @@ junk_plugin_setup (GtkComboBox *combo_box, EMMailerPrefs *prefs)
 	GtkCellRenderer *cell;
 	gint index = 0;
 	gboolean def_set = FALSE;
-	const GList *plugins = mail_session_get_junk_plugins();
+	const GList *plugins = mail_session_get_junk_plugins ();
 	gchar *pdefault = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/junk/default_plugin", NULL);
 
 	store = gtk_list_store_new (1, G_TYPE_STRING);
@@ -765,7 +765,7 @@ junk_plugin_setup (GtkComboBox *combo_box, EMMailerPrefs *prefs)
 
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (store, &iter, 0, iface->plugin_name, -1);
-		if (!def_set && pdefault && iface->plugin_name && !strcmp(pdefault, iface->plugin_name)) {
+		if (!def_set && pdefault && iface->plugin_name && !strcmp (pdefault, iface->plugin_name)) {
 			gboolean status;
 
 			def_set = TRUE;
@@ -797,7 +797,7 @@ junk_plugin_setup (GtkComboBox *combo_box, EMMailerPrefs *prefs)
 
 	g_signal_connect (
 		combo_box, "changed",
-		G_CALLBACK(junk_plugin_changed), prefs);
+		G_CALLBACK (junk_plugin_changed), prefs);
 	g_free (pdefault);
 }
 
@@ -841,8 +841,8 @@ em_mailer_prefs_construct (EMMailerPrefs *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]);
-	e_config_add_items((EConfig *)ec, l, NULL, NULL, emmp_free, prefs);
+		l = g_slist_prepend (l, &emmp_items[i]);
+	e_config_add_items ((EConfig *)ec, l, NULL, NULL, emmp_free, prefs);
 
 	/* General tab */
 
@@ -1206,9 +1206,9 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 					       NULL);
 
 	/* get our toplevel widget */
-	target = em_config_target_new_prefs(ec, prefs->gconf);
-	e_config_set_target((EConfig *)ec, (EConfigTarget *)target);
-	toplevel = e_config_create_widget((EConfig *)ec);
+	target = em_config_target_new_prefs (ec, prefs->gconf);
+	e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);
+	toplevel = e_config_create_widget ((EConfig *)ec);
 	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
 }
 
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 247ab242e4..1840d5a731 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -108,11 +108,11 @@ toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const gchar
 }
 
 static GtkWidget *
-emnp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
+emnp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
 	EMNetworkPrefs *prefs = data;
 
-	return e_builder_get_widget(prefs->builder, item->label);
+	return e_builder_get_widget (prefs->builder, item->label);
 }
 
 static void
@@ -224,11 +224,11 @@ static EMConfigItem emnp_items[] = {
 };
 
 static void
-emnp_free(EConfig *ec, GSList *items, gpointer data)
+emnp_free (EConfig *ec, GSList *items, gpointer data)
 {
 	/* the prefs data is freed automagically */
 
-	g_slist_free(items);
+	g_slist_free (items);
 }
 
 static void
@@ -277,8 +277,8 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	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]);
-	e_config_add_items((EConfig *)ec, l, NULL, NULL, emnp_free, prefs);
+		l = g_slist_prepend (l, &emnp_items[i]);
+	e_config_add_items ((EConfig *)ec, l, NULL, NULL, emnp_free, prefs);
 
 	/* Proxy tab */
 
@@ -343,32 +343,32 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	prefs->lbl_socks_host = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksHost"));
 	prefs->lbl_socks_port = GTK_LABEL (e_builder_get_widget (prefs->builder, "lblSocksPort"));
 	g_signal_connect (prefs->socks_host, "changed",
-			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY);
+			  G_CALLBACK (widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY);
 	g_signal_connect (prefs->socks_port, "value_changed",
-			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY);
+			  G_CALLBACK (widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY);
 #endif
 
 	/* Manual proxy options */
 	g_signal_connect (prefs->http_host, "changed",
-			  G_CALLBACK(widget_entry_changed_cb),
+			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTP_HOST_KEY);
 	g_signal_connect (prefs->https_host, "changed",
-			  G_CALLBACK(widget_entry_changed_cb),
+			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTPS_HOST_KEY);
 	g_signal_connect (prefs->ignore_hosts, "changed",
-			  G_CALLBACK(widget_entry_changed_cb),
+			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_IGNORE_HOSTS_KEY);
 	g_signal_connect (prefs->http_port, "value_changed",
-			  G_CALLBACK(widget_entry_changed_cb),
+			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTP_PORT_KEY);
 	g_signal_connect (prefs->https_port, "value_changed",
-			  G_CALLBACK(widget_entry_changed_cb),
+			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTPS_PORT_KEY);
 	g_signal_connect (prefs->auth_user, "changed",
-			  G_CALLBACK(widget_entry_changed_cb),
+			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_AUTH_USER_KEY);
 	g_signal_connect (prefs->auth_pwd, "changed",
-			  G_CALLBACK(widget_entry_changed_cb),
+			  G_CALLBACK (widget_entry_changed_cb),
 			  (gpointer) GCONF_E_AUTH_PWD_KEY);
 
 	gtk_toggle_button_set_active (prefs->manual_proxy, val == NETWORK_PROXY_MANUAL);
@@ -432,9 +432,9 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	}
 
 	/* get our toplevel widget */
-	target = em_config_target_new_prefs(ec, prefs->gconf);
-	e_config_set_target((EConfig *)ec, (EConfigTarget *)target);
-	toplevel = e_config_create_widget((EConfig *)ec);
+	target = em_config_target_new_prefs (ec, prefs->gconf);
+	e_config_set_target ((EConfig *)ec, (EConfigTarget *)target);
+	toplevel = e_config_create_widget ((EConfig *)ec);
 	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
 }