aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-view.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index d680b9eb22..9eae48d91f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-01 Dan Winship <danw@helixcode.com>
+
+ * e-shell-view.c (e_shell_view_set_view): Turn off control frame
+ autoactivation, so the toolbars work correctly. This may actually
+ be a bug in Bonobo, but we'll kludge around it here for now.
+
2000-04-27 Ettore Perazzoli <ettore@helixcode.com>
* e-shell-view.c: OAFized.
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index b6d74276e5..3e351a8853 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -377,6 +377,7 @@ e_shell_view_set_view (EShellView *eshell_view, EFolder *efolder)
control_frame =
bonobo_widget_get_control_frame (BONOBO_WIDGET (folder_view));
+ bonobo_control_frame_set_autoactivate (control_frame, FALSE);
bonobo_control_frame_control_activate (control_frame);
}