diff options
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/e-shell-view-menu.c | 17 |
2 files changed, 15 insertions, 9 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 511e19dd5f..7084fc0a9a 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,12 @@ 2001-08-15 Jason Leach <jleach@ximian.com> + * e-shell-view-menu.c (command_help): Don't hardcode/build a help + URI here, use gnome_help_display() instead, which will figure out + what language the user needs, etc. + (help_verbs): Adapt these menu items to above changes, they don't + need to pass "evolution/foo.html" to command_help, just + "foo.html". + * e-folder.c (e_folder_set_child_highlight): Emit a "changed" signal at the end of this function. Bug #7232. diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 56239224f2..8575f472e4 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -34,6 +34,7 @@ #include <libgnome/gnome-defs.h> #include <libgnome/gnome-exec.h> +#include <libgnome/gnome-help.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-url.h> #include <libgnome/gnome-util.h> @@ -233,11 +234,9 @@ command_help (BonoboUIComponent *uih, void *data, const char *path) { - char *url; + GnomeHelpMenuEntry help_entry = { "evolution", data }; - url = g_strdup_printf ("ghelp:%s/gnome/help/evolution/C/%s", - EVOLUTION_DATADIR, (char *)data); - gnome_url_show (url); + gnome_help_display (NULL, &help_entry); } static void @@ -637,11 +636,11 @@ BonoboUIVerb folder_verbs [] = { }; BonoboUIVerb help_verbs [] = { - BONOBO_UI_VERB_DATA ("HelpIndex", command_help, "evolution/index.html"), - BONOBO_UI_VERB_DATA ("HelpGetStarted", command_help, "evolution/usage-mainwindow.html"), - BONOBO_UI_VERB_DATA ("HelpUsingMail", command_help, "evolution/usage-mail.html"), - BONOBO_UI_VERB_DATA ("HelpUsingCalendar", command_help, "evolution/usage-calendar.html"), - BONOBO_UI_VERB_DATA ("HelpUsingContact", command_help, "evolution/usage-contact.html"), + BONOBO_UI_VERB_DATA ("HelpIndex", command_help, "index.html"), + BONOBO_UI_VERB_DATA ("HelpGetStarted", command_help, "usage-mainwindow.html"), + 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_END }; |