From 2b820fc4e2d6404ca281e279761cd5f877fdbf54 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 13:55:04 +0000 Subject: New convenience function calls gtk_show_uri() and displays an error dialog 2009-01-11 Matthew Barnes * e-util/e-util.c (e_show_uri): New convenience function calls gtk_show_uri() and displays an error dialog if the URI cannot be shown. * addressbook/gui/widgets/eab-contact-display.c (eab_uri_popup_link_open), (on_link_clicked): * calendar/gui/e-cal-component-preview (on_link_clicked): * calendar/gui/e-cal-component-memo-preview (on_link_clicked): * calendar/gui/e-memo-table.c (open_url_cb): * calendar/gui/dialogs/comp-editor.c (open_attachment): * composer/e-msg-composer.c (msg_composer_link_clicked): * mail/em-folder-view.c (emfv_format_link_clicked): * mail/em-popup.c (emp_uri_popup_link_open): * plugins/mailing-list-actions/mailing-list-actions.c (emla_list_action_do): * shell/e-shell-window-commands.c (command_open_faq): * widgets/misc/e-attachment-bar.c (eab_icon_clicked_cb): * widgets/misc/e-url-entry.c (button_clicked_cb): Call e_show_uri() instead of gnome_url_show(). * e-util/e-error.c (ee_response): Call e_display_help() instead of gnome_url_show(). * mail/em-config.c: * mail/em-menu.c: Remove unneeded #include svn path=/trunk/; revision=37037 --- shell/e-shell-window-commands.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'shell/e-shell-window-commands.c') diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index 65273f8ad3..609e7c79b3 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -29,7 +29,6 @@ #include #include -#include #include @@ -43,6 +42,7 @@ #include "e-util/e-error.h" #include "e-util/e-icon-factory.h" #include "e-util/e-print.h" +#include "e-util/e-util.h" #include "e-util/e-util-private.h" #include "e-shell-window-commands.h" @@ -963,15 +963,11 @@ command_open_faq (BonoboUIComponent *uih, EShellWindow *window, const char *path) { - GError *error = NULL; + const gchar *uri; - 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); - } - } + uri = "http://www.go-evolution.org/FAQ"; + e_show_uri (GTK_WINDOW (window), uri); +} static void command_quick_reference (BonoboUIComponent *uih, -- cgit v1.2.3