Miscellaneous cleanups.

7 files changed, 24 insertions, 17 deletions

diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index d5f291f3b1..4ae8b4ba78 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -202,8 +202,8 @@ action_address_book_properties_cb (GtkAction *action,
 
 static void
 address_book_refresh_done_cb (GObject *source_object,
-			      GAsyncResult *result,
-			      gpointer user_data)
+                              GAsyncResult *result,
+                              gpointer user_data)
 {
 	EClient *client;
 	GError *error = NULL;
@@ -228,7 +228,7 @@ address_book_refresh_done_cb (GObject *source_object,
 
 static void
 action_address_book_refresh_cb (GtkAction *action,
-				EBookShellView *book_shell_view)
+                                EBookShellView *book_shell_view)
 {
 	EBookShellSidebar *book_shell_sidebar;
 	ESourceSelector *selector;
diff --git a/modules/cal-config-google/e-google-chooser.c b/modules/cal-config-google/e-google-chooser.c
index 1a4ebbcfb8..ed3365ce44 100644
--- a/modules/cal-config-google/e-google-chooser.c
+++ b/modules/cal-config-google/e-google-chooser.c
@@ -627,7 +627,7 @@ e_google_chooser_apply_selected (EGoogleChooser *chooser)
 
 void
 e_google_chooser_construct_default_uri (SoupURI *soup_uri,
-					const gchar *username)
+                                        const gchar *username)
 {
 	gchar *decoded_user, *path;
 
diff --git a/modules/cal-config-google/evolution-cal-config-google.c b/modules/cal-config-google/evolution-cal-config-google.c
index 9f6310b036..5b095150a3 100644
--- a/modules/cal-config-google/evolution-cal-config-google.c
+++ b/modules/cal-config-google/evolution-cal-config-google.c
@@ -127,7 +127,8 @@ cal_config_google_commit_changes (ESourceConfigBackend *backend,
 		ESourceAuthentication *authentication_extension
 			= e_source_get_extension (scratch_source, E_SOURCE_EXTENSION_AUTHENTICATION);
 
-		e_google_chooser_construct_default_uri (soup_uri,
+		e_google_chooser_construct_default_uri (
+			soup_uri,
 			e_source_authentication_get_user (authentication_extension));
 	}
 
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 5a4210f404..c5cdb89713 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -317,8 +317,8 @@ gc_get_default_time (ECalModel *model,
 
 static void
 cal_shell_content_is_editing_changed_cb (gpointer cal_view_tasks_memos_table,
-					 GParamSpec *param,
-					 EShellView *shell_view)
+                                         GParamSpec *param,
+                                         EShellView *shell_view)
 {
 	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
 
@@ -415,7 +415,8 @@ cal_shell_content_constructed (GObject *object)
 	for (ii = 0; ii < GNOME_CAL_LAST_VIEW; ii++) {
 		calendar_view = gnome_calendar_get_calendar_view (calendar, ii);
 
-		g_signal_connect (calendar_view, "notify::is-editing",
+		g_signal_connect (
+			calendar_view, "notify::is-editing",
 			G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view);
 
 		gtk_notebook_append_page (
@@ -429,7 +430,8 @@ cal_shell_content_constructed (GObject *object)
 		priv->notebook, "page",
 		G_BINDING_SYNC_CREATE);
 
-	g_signal_connect (widget, "notify::is-editing",
+	g_signal_connect (
+		widget, "notify::is-editing",
 		G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view);
 
 	container = priv->vpaned;
@@ -519,7 +521,8 @@ cal_shell_content_constructed (GObject *object)
 			shell_view);
 	}
 
-	g_signal_connect (widget, "notify::is-editing",
+	g_signal_connect (
+		widget, "notify::is-editing",
 		G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view);
 
 	/* Load the view instance. */
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 1d0529c9ed..cdf047f9d9 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -385,7 +385,8 @@ cal_shell_sidebar_restore_state_cb (EShellWindow *shell_window,
 	shell = e_shell_window_get_shell (shell_window);
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	g_signal_handlers_disconnect_by_func (shell_window,
+	g_signal_handlers_disconnect_by_func (
+		shell_window,
 		cal_shell_sidebar_restore_state_cb, shell_sidebar);
 
 	selector = E_SOURCE_SELECTOR (priv->selector);
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index ded7e8af67..9a3697668d 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -302,8 +302,8 @@ memo_shell_content_restore_state_cb (EShellWindow *shell_window,
 
 static void
 memo_shell_content_is_editing_changed_cb (EMemoTable *memo_table,
-					  GParamSpec *param,
-					  EShellView *shell_view)
+                                          GParamSpec *param,
+                                          EShellView *shell_view)
 {
 	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
 
@@ -552,7 +552,8 @@ memo_shell_content_constructed (GObject *object)
 		G_CALLBACK (memo_shell_content_selection_change_cb),
 		object);
 
-	g_signal_connect (priv->memo_table, "notify::is-editing",
+	g_signal_connect (
+		priv->memo_table, "notify::is-editing",
 		G_CALLBACK (memo_shell_content_is_editing_changed_cb), shell_view);
 
 	g_signal_connect_swapped (
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 7bfb5b741f..90361776a1 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -302,8 +302,8 @@ task_shell_content_restore_state_cb (EShellWindow *shell_window,
 
 static void
 task_shell_content_is_editing_changed_cb (ETaskTable *task_table,
-					  GParamSpec *param,
-					  EShellView *shell_view)
+                                          GParamSpec *param,
+                                          EShellView *shell_view)
 {
 	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
 
@@ -552,7 +552,8 @@ task_shell_content_constructed (GObject *object)
 		G_CALLBACK (task_shell_content_selection_change_cb),
 		object);
 
-	g_signal_connect (priv->task_table, "notify::is-editing",
+	g_signal_connect (
+		priv->task_table, "notify::is-editing",
 		G_CALLBACK (task_shell_content_is_editing_changed_cb), shell_view);
 
 	g_signal_connect_swapped (