[evolution] Shell cleanup.

[Matthew Barnes <mbarnes src gnome org>]

commit 993cfc00e95f057e02e0e31914193b20a1f51d34
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Oct 7 10:13:01 2009 -0500

    Shell cleanup.

 shell/e-shell-window-actions.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 9616e97..3eb25e2 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -908,10 +908,10 @@ action_preferences_cb (GtkAction *action,
 	GtkWidget *preferences_window;
 	EShellView *shell_view;
 	EShellBackend *shell_backend;
+	EShellBackendClass *shell_backend_class;
+	const gchar *view_name;
 
 	shell = e_shell_window_get_shell (shell_window);
-	shell_view = e_shell_window_get_shell_view (shell_window, e_shell_window_get_active_view (shell_window));
-	shell_backend = shell_view ? e_shell_view_get_shell_backend (shell_view) : NULL;
 	preferences_window = e_shell_get_preferences_window (shell);
 
 	gtk_window_set_transient_for (
@@ -922,9 +922,16 @@ action_preferences_cb (GtkAction *action,
 		GTK_WIN_POS_CENTER_ON_PARENT);
 	gtk_window_present (GTK_WINDOW (preferences_window));
 
-	if (shell_backend && E_SHELL_BACKEND_GET_CLASS (shell_backend)->preferences_page) {
-		e_preferences_window_show_page (E_PREFERENCES_WINDOW (preferences_window), E_SHELL_BACKEND_GET_CLASS (shell_backend)->preferences_page);
-	}
+	view_name = e_shell_window_get_active_view (shell_window);
+	shell_view = e_shell_window_get_shell_view (shell_window, view_name);
+
+	shell_backend = e_shell_view_get_shell_backend (shell_view);
+	shell_backend_class = E_SHELL_BACKEND_GET_CLASS (shell_backend);
+
+	if (shell_backend_class->preferences_page != NULL)
+		e_preferences_window_show_page (
+			E_PREFERENCES_WINDOW (preferences_window),
+			shell_backend_class->preferences_page);
 }
 
 /**