aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-window.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 5c743f210a..e74c46d17e 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-23 JP Rosevear <jpr@ximian.com>
+
+ * e-shell-window.c (e_shell_window_show_settings): if there is a
+ current view, use the component alias to select a sensible default
+ config control
+
2004-04-22 Trent Lloyd <lathiat@bur.st>
* e-sidebar.c (do_layout_text_buttons): take into account the position
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 592b20688f..d61ef54822 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -824,7 +824,7 @@ e_shell_window_show_settings (EShellWindow *window)
{
g_return_if_fail (E_IS_SHELL_WINDOW (window));
- e_shell_show_settings (window->priv->shell, NULL, window);
+ e_shell_show_settings (window->priv->shell, window->priv->current_view ? window->priv->current_view->component_alias : NULL, window);
}