New convenience function calls gtk_show_uri() and displays an error dialog

2009-01-11  Matthew Barnes  <mbarnes@redhat.com>

	* 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 <libgnome/gnome-url.h>


svn path=/trunk/; revision=37037

2 files changed, 14 insertions, 18 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index f8b64c868e..2255936197 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/widgets/eab-contact-display.c (eab_uri_popup_link_open),
+	(on_link_clicked):
+	Call e_show_uri() instead of gnome_url_show().
+
 2009-01-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/contact-editor/e-contact-editor-fullname.c:
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index f8a15a06fa..4e7418dc5c 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -28,12 +28,12 @@
 #include "eab-popup.h"
 
 #include "eab-gui-util.h"
+#include "e-util/e-util.h"
 #include "e-util/e-html-utils.h"
 #include "e-util/e-icon-factory.h"
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-url.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 
@@ -81,13 +81,9 @@ static void
 eab_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data)
 {
 	EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target;
-	GError *err = NULL;
 
-	gnome_url_show(t->uri, &err);
-	if (err) {
-		g_warning("gnome_url_show: %s", err->message);
-		g_error_free(err);
-	}
+	/* FIXME Pass a parent window. */
+	e_show_uri (NULL, t->uri);
 }
 
 static void
@@ -258,13 +254,11 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
 }
 
 static void
-on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display)
+on_link_clicked (GtkHTML *html, const char *uri, EABContactDisplay *display)
 {
-	GError *err = NULL;
-
 #ifdef HANDLE_MAILTO_INTERNALLY
-	if (!strncmp (url, "internal-mailto:", strlen ("internal-mailto:"))) {
-		int mail_num = atoi (url + strlen ("internal-mailto:"));
+	if (!strncmp (uri, "internal-mailto:", strlen ("internal-mailto:"))) {
+		int mail_num = atoi (uri + strlen ("internal-mailto:"));
 
 		if (mail_num == -1)
 			return;
@@ -275,12 +269,8 @@ on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display)
 	}
 #endif
 
-	gnome_url_show (url, &err);
-
-	if (err) {
-		g_warning ("gnome_url_show: %s", err->message);
-		g_error_free (err);
-	}
+	/* FIXME Pass a parent window. */
+	e_show_uri (NULL, uri);
 }
 
 #if 0