diff options
| author | Andre Klapper <a9016009@gmx.de> | 2007-11-27 03:50:36 +0800 |
|---|---|---|
| committer | Andre Klapper <aklapper@src.gnome.org> | 2007-11-27 03:50:36 +0800 |
| commit | d218775fe404a4533636d972f9c5e18bffaa6309 (patch) | |
| tree | 1a5bcec617cdce839846e79bb1dd858fbe6dc5ec | |
| parent | 1fd244770af881843b82eee3320f036634e169ab (diff) | |
| download | gsoc2013-evolution-d218775fe404a4533636d972f9c5e18bffaa6309.tar gsoc2013-evolution-d218775fe404a4533636d972f9c5e18bffaa6309.tar.gz gsoc2013-evolution-d218775fe404a4533636d972f9c5e18bffaa6309.tar.bz2 gsoc2013-evolution-d218775fe404a4533636d972f9c5e18bffaa6309.tar.lz gsoc2013-evolution-d218775fe404a4533636d972f9c5e18bffaa6309.tar.xz gsoc2013-evolution-d218775fe404a4533636d972f9c5e18bffaa6309.tar.zst gsoc2013-evolution-d218775fe404a4533636d972f9c5e18bffaa6309.zip | |
** Fixes bug #497810
2007-11-26 Andre Klapper <a9016009@gmx.de>
** Fixes bug #497810
* ui/evolution.xml:
* shell/e-shell-window-commands.c:
add "Evolution FAQ" help menu item
svn path=/trunk/; revision=34589
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/e-shell-window-commands.c | 21 | ||||
| -rw-r--r-- | ui/ChangeLog | 7 | ||||
| -rw-r--r-- | ui/evolution.xml | 7 |
4 files changed, 30 insertions, 12 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 403b50949c..e637930b59 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2007-11-26 Andre Klapper <a9016009@gmx.de> + + ** Fixes bug #497810 + + * e-shell-window-commands.c: + add "Evolution FAQ" help menu item + 2007-11-02 Damien Carbery <damien.carbery@sun.com> ** Fixes bug #492058 diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 7700e86608..a3b50ac6d8 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -679,18 +679,20 @@ command_about (BonoboUIComponent *uih, NULL); } -#if 0 -/* Unused */ static void -command_help_faq (BonoboUIComponent *uih, +command_open_faq (BonoboUIComponent *uih, EShellWindow *window, - const char *path) + const char *path) { - /* FIXME Show when we have a faq */ - /* FIXME use the error */ - gnome_url_show ("http://gnome.org/projects/evolution/faq.shtml", NULL); -} -#endif + GError *error = NULL; + + gnome_url_show ("http://www.go-evolution.org/FAQ", &error); + if (error != NULL) { + e_notice (NULL, GTK_MESSAGE_ERROR, + _("Error opening the FAQ webpage.")); + g_error_free (error); + } + } static void command_quick_reference (BonoboUIComponent *uih, @@ -837,6 +839,7 @@ static BonoboUIVerb tools_verbs[] = { static BonoboUIVerb help_verbs [] = { BONOBO_UI_VERB ("QuickReference", (BonoboUIVerbFn) command_quick_reference), + BONOBO_UI_VERB ("HelpOpenFAQ", (BonoboUIVerbFn) command_open_faq), BONOBO_UI_VERB ("HelpSubmitBug", (BonoboUIVerbFn) command_submit_bug), BONOBO_UI_VERB ("HelpAbout", (BonoboUIVerbFn) command_about), diff --git a/ui/ChangeLog b/ui/ChangeLog index fdc9039416..d4b5a7669a 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,10 @@ +2007-11-26 Andre Klapper <a9016009@gmx.de> + + ** Fixes bug #497810 + + * evolution.xml: + add "Evolution FAQ" help menu item + 2007-11-26 Nicholas Miell <nmiell@gmail.com> ** Part of fix for bug #216485 diff --git a/ui/evolution.xml b/ui/evolution.xml index 92036c6a14..3b4ea02005 100644 --- a/ui/evolution.xml +++ b/ui/evolution.xml @@ -39,6 +39,9 @@ <cmd name="HelpSubmitBug" _label="Submit Bug Report" _tip="Submit a bug report using Bug Buddy"/> + <cmd name="HelpOpenFAQ" _label="Evolution _FAQ" + _tip="Open the Frequently Asked Questions webpage"/> + <cmd name="SendReceive" _tip="Send queued items and retrieve new items" pixtype="pixbuf"/> @@ -159,11 +162,9 @@ <separator f="" name="eshell2"/> - <!-- <menuitem name="HelpFAQ" verb="" + <menuitem name="HelpOpenFAQ" verb="" _label="Evolution _FAQ"/> - <separator/> --> - <menuitem name="HelpSubmitBug" verb="" _label="Submit _Bug Report"/> |