Coding style and whitespace cleanup.

5 files changed, 18 insertions, 7 deletions

diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 9491d3fee2..f5f87618e1 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -637,7 +637,7 @@ cal_shell_sidebar_constructed (GObject *object)
 		GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (
 		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
-	if (!e_shell_get_express_mode(e_shell_get_default())) {
+	if (!e_shell_get_express_mode (shell)) {
 		gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
 	} else {
 		GtkWidget *button;
@@ -647,7 +647,9 @@ cal_shell_sidebar_constructed (GObject *object)
 
 		button = gtk_button_new_with_label (_("New Calendar..."));
 		gtk_box_pack_start (GTK_BOX(container), button, FALSE, FALSE, 0);
-		g_signal_connect (button, "clicked", G_CALLBACK(new_calendar_clicked), shell_sidebar);
+		g_signal_connect (
+			button, "clicked",
+			G_CALLBACK (new_calendar_clicked), shell_sidebar);
 
 		gtk_paned_pack1 (GTK_PANED (priv->paned), container, TRUE, TRUE);
 		gtk_widget_show_all (container);
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 11b6ec243d..aa1008558a 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -464,7 +464,9 @@ system_timezone_monitor_changed (GFileMonitor *handle,
 	current_zone = e_cal_model_get_timezone (model);
 	timezone = e_cal_util_get_system_timezone ();
 
-	if (!g_strcmp0 (icaltimezone_get_tzid (timezone), icaltimezone_get_tzid (current_zone)))
+	if (!g_strcmp0 (
+		icaltimezone_get_tzid (timezone),
+		icaltimezone_get_tzid (current_zone)))
 		return;
 
 	shell_backend = e_shell_view_get_shell_backend ((EShellView *) view);
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 218bd7d4da..8833be75d0 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -277,6 +277,7 @@ cal_shell_view_update_actions (EShellView *shell_view)
 	ECalShellContent *cal_shell_content;
 	EShellSidebar *shell_sidebar;
 	EShellWindow *shell_window;
+	EShell *shell;
 	GnomeCalendarViewType view_type;
 	GnomeCalendar *calendar;
 	ECalendarView *view;
@@ -303,8 +304,9 @@ cal_shell_view_update_actions (EShellView *shell_view)
 	priv = E_CAL_SHELL_VIEW_GET_PRIVATE (shell_view);
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
+	shell = e_shell_window_get_shell (shell_window);
 
-	if (e_shell_get_express_mode(e_shell_get_default())) {
+	if (e_shell_get_express_mode (shell)) {
 		GtkWidget *widget, *item;
 
 		/* Hack: Get rid of New and Send/Receive in toolbar
@@ -498,7 +500,10 @@ cal_shell_view_class_init (ECalShellViewClass *class,
 	shell_view_class->execute_search = cal_shell_view_execute_search;
 	shell_view_class->update_actions = cal_shell_view_update_actions;
 
-	if (e_shell_get_express_mode(e_shell_get_default()))
+	/* XXX This is an unusual place to need an EShell instance.
+	 *     Would be cleaner to implement a method that either
+	 *     chains up or does nothing based on express mode. */
+	if (e_shell_get_express_mode (e_shell_get_default ()))
 		shell_view_class->construct_searchbar = NULL;
 
 }
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 3ba34e68c0..2fa6389bd0 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -217,6 +217,7 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action,
 	EShellView *shell_view;
 	CamelFolder *folder;
 	GtkWindow *parent;
+	MailFolderCache *cache;
 	MessageList *message_list;
 	GPtrArray *uids;
 	const gchar *key;
@@ -232,8 +233,9 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action,
 	folder = e_mail_reader_get_folder (reader);
 	g_return_if_fail (folder != NULL);
 
+	cache = mail_folder_cache_get_default ();
 	key = "/apps/evolution/mail/prompts/mark_all_read";
-	if (mail_folder_cache_get_folder_has_children (mail_folder_cache_get_default (), folder, NULL))
+	if (mail_folder_cache_get_folder_has_children (cache, folder, NULL))
 		prompt = "mail:ask-mark-all-read-sub";
 	else
 		prompt = "mail:ask-mark-all-read";
diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c
index eb4b60cf97..68a6233b43 100644
--- a/modules/plugin-mono/e-plugin-mono.c
+++ b/modules/plugin-mono/e-plugin-mono.c
@@ -125,7 +125,7 @@ plugin_mono_invoke (EPlugin *plugin,
 		mono_config_parse (NULL);
 		domain = mono_jit_init (plugin_mono->location);
 	}
-	
+
 	/* We need to do this every time since we may
 	 * be called from any thread for some uses. */
 	mono_thread_attach (domain);