aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2007-11-27 03:50:36 +0800
committerAndre Klapper <aklapper@src.gnome.org>2007-11-27 03:50:36 +0800
commitd218775fe404a4533636d972f9c5e18bffaa6309 (patch)
tree1a5bcec617cdce839846e79bb1dd858fbe6dc5ec /shell
parent1fd244770af881843b82eee3320f036634e169ab (diff)
downloadgsoc2013-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
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell-window-commands.c21
2 files changed, 19 insertions, 9 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),