From afc127193137188d4efc11194698a2b22f138f75 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 2 Oct 2000 23:30:03 +0000 Subject: kill. 2000-10-03 Michael Meeks * e-shell-view.c (setup_bonobo_ui_handler): kill. * e-shell-view-menu.c (e_shell_view_menu_setup): strip out the XML UI merge; move it to * e-shell-view.c (e_shell_view_construct): here, + freeze / thaw pair. * e-shell-view.c (setup_progress_bar): impl. (setup_widgets): hook in. (progress_bar_timeout_cb): fix. (start_progress_bar): fix. (stop_progress_bar): fix. (e_shell_view_construct): setup ui handler first. 2000-09-22 Michael Meeks * e-shell-view-menu.c (e_shell_view_menu_setup): upd. + upd ChangeLogs svn path=/trunk/; revision=5678 --- shell/e-shell-view-menu.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'shell/e-shell-view-menu.c') diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 13ec5c4cb8..2779cc94f7 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -446,7 +446,6 @@ void e_shell_view_menu_setup (EShellView *shell_view) { BonoboUIHandler *uih; - Bonobo_UIContainer container; BonoboUIComponent *component; g_return_if_fail (shell_view != NULL); @@ -465,15 +464,6 @@ e_shell_view_menu_setup (EShellView *shell_view) bonobo_ui_component_add_verb_list_with_data ( component, help_verbs, shell_view); - container = bonobo_ui_compat_get_container (uih); - g_return_if_fail (container != CORBA_OBJECT_NIL); - - bonobo_ui_container_freeze (container, NULL); - - bonobo_ui_util_set_ui (component, container, - EVOLUTION_DATADIR, "evolution.xml", - "evolution"); - menu_do_misc (component, shell_view); gtk_signal_connect (GTK_OBJECT (shell_view), "shortcut_bar_mode_changed", @@ -488,6 +478,4 @@ e_shell_view_menu_setup (EShellView *shell_view) FOLDER_BAR_TOGGLE_PATH); shortcut_bar_mode_changed_cb (shell_view, e_shell_view_get_shortcut_bar_mode (shell_view), SHORTCUT_BAR_TOGGLE_PATH); - - bonobo_ui_container_thaw (container, NULL); } -- cgit v1.2.3