Coding style and whitespace cleanup.

7 files changed, 23 insertions, 14 deletions

diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index c7511f69f8..c1a7221597 100644
--- a/modules/calendar/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
@@ -110,11 +110,16 @@ create_calendar_sources (EShellBackend *shell_backend,
 			if (!strcmp (base_uri, e_source_group_peek_base_uri (group)))
 				e_source_group_set_base_uri (group, base_uri_proto);
 
-			if (!*on_this_computer && !strcmp (base_uri_proto, e_source_group_peek_base_uri (group)))
+			if (!*on_this_computer && !strcmp (base_uri_proto,
+				e_source_group_peek_base_uri (group)))
 				*on_this_computer = g_object_ref (group);
-			else if (!*on_the_web && !strcmp (WEBCAL_BASE_URI, e_source_group_peek_base_uri (group)))
+
+			else if (!*on_the_web && !strcmp (WEBCAL_BASE_URI,
+				e_source_group_peek_base_uri (group)))
 				*on_the_web = g_object_ref (group);
-			else if (!*contacts && !strcmp (CONTACTS_BASE_URI, e_source_group_peek_base_uri (group)))
+
+			else if (!*contacts && !strcmp (CONTACTS_BASE_URI,
+				e_source_group_peek_base_uri (group)))
 				*contacts = g_object_ref (group);
 		}
 	}
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index a819d88473..8ddf8acf6a 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -669,10 +669,10 @@ cal_shell_sidebar_constructed (GObject *object)
 		GtkWidget *button;
 
 		container = gtk_vbox_new (FALSE, 6);
-		gtk_box_pack_start (GTK_BOX(container), widget, TRUE, TRUE, 0);
+		gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 
 		button = gtk_button_new_with_mnemonic (_("_New Calendar..."));
-		gtk_box_pack_start (GTK_BOX(container), button, FALSE, FALSE, 0);
+		gtk_box_pack_start (GTK_BOX (container), button, FALSE, FALSE, 0);
 		g_signal_connect (
 			button, "clicked",
 			G_CALLBACK (new_calendar_clicked), shell_sidebar);
diff --git a/modules/calendar/e-memo-shell-content.h b/modules/calendar/e-memo-shell-content.h
index 4567a94aa9..3ab68db440 100644
--- a/modules/calendar/e-memo-shell-content.h
+++ b/modules/calendar/e-memo-shell-content.h
@@ -75,7 +75,8 @@ struct _EMemoShellContentClass {
 GType		e_memo_shell_content_get_type	(void);
 void		e_memo_shell_content_register_type
 					(GTypeModule *type_module);
-GtkWidget *	e_memo_shell_content_new(EShellView *shell_view);
+GtkWidget *	e_memo_shell_content_new
+					(EShellView *shell_view);
 ECalModel *	e_memo_shell_content_get_memo_model
 					(EMemoShellContent *memo_shell_conent);
 EMemoTable *	e_memo_shell_content_get_memo_table
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index 771a889845..d85824767f 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -196,7 +196,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name,  const gchar
 	ids = gconf_client_get_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, &error);
 	if (error != NULL) {
 		g_warning("%s (%s) %s\n", G_STRLOC, G_STRFUNC, error->message);
-		g_error_free(error);
+		g_error_free (error);
 	}
 	ids = g_slist_append (ids, g_strdup (e_source_peek_uid (source)));
 	gconf_client_set_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, ids, NULL);
@@ -240,10 +240,10 @@ e_memo_shell_backend_migrate (EShellBackend *shell_backend,
 		EIterator *it;
 		GConfClient *gconf_client = gconf_client_get_default ();
 		al = e_account_list_new (gconf_client);
-		for (it = e_list_get_iterator((EList *)al);
-				e_iterator_is_valid(it);
-				e_iterator_next(it)) {
-			a = (EAccount *) e_iterator_get(it);
+		for (it = e_list_get_iterator ((EList *)al);
+				e_iterator_is_valid (it);
+				e_iterator_next (it)) {
+			a = (EAccount *) e_iterator_get (it);
 			if (!a->enabled || !is_groupwise_account (a))
 				continue;
 			url = camel_url_new (a->source->url, NULL);
diff --git a/modules/calendar/e-memo-shell-sidebar.h b/modules/calendar/e-memo-shell-sidebar.h
index 0d32c7b429..91e0ccc618 100644
--- a/modules/calendar/e-memo-shell-sidebar.h
+++ b/modules/calendar/e-memo-shell-sidebar.h
@@ -81,7 +81,8 @@ struct _EMemoShellSidebarClass {
 GType		e_memo_shell_sidebar_get_type	(void);
 void		e_memo_shell_sidebar_register_type
 					(GTypeModule *type_module);
-GtkWidget *	e_memo_shell_sidebar_new(EShellView *shell_view);
+GtkWidget *	e_memo_shell_sidebar_new
+					(EShellView *shell_view);
 GList *		e_memo_shell_sidebar_get_clients
 					(EMemoShellSidebar *memo_shell_sidebar);
 ECal *		e_memo_shell_sidebar_get_default_client
diff --git a/modules/calendar/e-task-shell-content.h b/modules/calendar/e-task-shell-content.h
index d4e67d1b95..eb327afdb7 100644
--- a/modules/calendar/e-task-shell-content.h
+++ b/modules/calendar/e-task-shell-content.h
@@ -79,7 +79,8 @@ struct _ETaskShellContentClass {
 GType		e_task_shell_content_get_type	(void);
 void		e_task_shell_content_register_type
 					(GTypeModule *type_module);
-GtkWidget *	e_task_shell_content_new(EShellView *shell_view);
+GtkWidget *	e_task_shell_content_new
+					(EShellView *shell_view);
 ECalModel *	e_task_shell_content_get_task_model
 					(ETaskShellContent *task_shell_content);
 ETaskTable *	e_task_shell_content_get_task_table
diff --git a/modules/calendar/e-task-shell-sidebar.h b/modules/calendar/e-task-shell-sidebar.h
index 152c7ca32f..17e50f8239 100644
--- a/modules/calendar/e-task-shell-sidebar.h
+++ b/modules/calendar/e-task-shell-sidebar.h
@@ -81,7 +81,8 @@ struct _ETaskShellSidebarClass {
 GType		e_task_shell_sidebar_get_type	(void);
 void		e_task_shell_sidebar_register_type
 					(GTypeModule *type_module);
-GtkWidget *	e_task_shell_sidebar_new(EShellView *shell_view);
+GtkWidget *	e_task_shell_sidebar_new
+					(EShellView *shell_view);
 GList *		e_task_shell_sidebar_get_clients
 					(ETaskShellSidebar *task_shell_sidebar);
 ECal *		e_task_shell_sidebar_get_default_client