aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog10
-rw-r--r--shell/e-shell-view-menu.c8
2 files changed, 15 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6ad17fa0fb..d986283db5 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -2,6 +2,16 @@
* e-shell-view.c (setup_progress_bar): remove evil usize set.
+2000-10-03 Matt Bissiri <bissiri@eecs.umich.edu>
+
+ * e-shell-view-menu.c (e_shell_view_menu_setup): Use
+ `bonobo_ui_component_add_verb_list' instead of
+ `bonobo_ui_component_add_verb_list_with_data' for help_verbs,
+ so that `command_help' gets an html filename as user_data,
+ instead of a ptr to EShellView.
+ (menu_do_misc): Move DumpXML from help_verbs to here, because
+ `command_xml_dump' needs to get EShellView as user_data.
+
2000-10-02 Ettore Perazzoli <ettore@helixcode.com>
* e-shortcuts-view.c (show_new_group_dialog): Destroy the dialog
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 2779cc94f7..6d6d55b7c7 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -415,7 +415,6 @@ BonoboUIVerb help_verbs [] = {
BONOBO_UI_VERB_DATA ("HelpUsingMail", command_help, "usage-mail.html"),
BONOBO_UI_VERB_DATA ("HelpUsingCalendar", command_help, "usage-calendar.html"),
BONOBO_UI_VERB_DATA ("HelpUsingContact", command_help, "usage-contact.html"),
- BONOBO_UI_VERB ("DumpXML", command_xml_dump),
BONOBO_UI_VERB_END
};
@@ -436,6 +435,9 @@ menu_do_misc (BonoboUIComponent *component,
bonobo_ui_component_add_verb (
component, "HelpAbout",
(BonoboUIVerbFn) command_about_box, shell_view);
+ bonobo_ui_component_add_verb (
+ component, "DumpXML",
+ (BonoboUIVerbFn) command_xml_dump, shell_view);
}
@@ -461,8 +463,8 @@ e_shell_view_menu_setup (EShellView *shell_view)
bonobo_ui_component_add_verb_list_with_data (
component, new_verbs, shell_view);
- bonobo_ui_component_add_verb_list_with_data (
- component, help_verbs, shell_view);
+ bonobo_ui_component_add_verb_list (
+ component, help_verbs);
menu_do_misc (component, shell_view);