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

5 files changed, 14 insertions, 22 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 13eea3ba5b..915369221f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-11  Matthew Barnes  <mbarnes@redhat.com>
+
+	* em-config.c:
+	* em-menu.c:
+	Remove unneeded #include <libgnome/gnome-url.h>
+
+	* em-folder-view.c (emfv_format_link_clicked):
+	* em-popup.c (emp_uri_popup_link_open):
+	Call e_show_uri() instead of gnome_url_show().
+
 2009-10-10  Matthew Barnes  <mbarnes@redhat.com>
 
 	* em-folder-view.c:
diff --git a/mail/em-config.c b/mail/em-config.c
index 9075fc3842..94df437519 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -29,8 +29,6 @@
 
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-url.h>
-
 #include "em-config.h"
 #include "libedataserver/e-msgport.h"
 #include "em-utils.h"
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index d341f4cec6..301f612193 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -38,8 +38,6 @@
 #undef interface
 #endif
 
-#include <libgnome/gnome-url.h>
-
 #include <gconf/gconf-client.h>
 
 #include <camel/camel-mime-message.h>
@@ -2731,14 +2729,8 @@ emfv_format_link_clicked(EMFormatHTMLDisplay *efhd, const char *uri, EMFolderVie
 	} else if (!g_ascii_strncasecmp (uri, "cid:", 4)) {
 		/* ignore */
 	} else {
-		GError *err = NULL;
-
-		gnome_url_show (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, uri);
 	}
 }
 
diff --git a/mail/em-menu.c b/mail/em-menu.c
index 9894054dc7..fc2e43d455 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -29,8 +29,6 @@
 
 #include <gtk/gtk.h>
 
-#include <libgnome/gnome-url.h>
-
 #include "em-menu.h"
 #include "libedataserver/e-msgport.h"
 #include "em-utils.h"
diff --git a/mail/em-popup.c b/mail/em-popup.c
index dfd09d2ad0..b6b7b23884 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -31,8 +31,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libgnome/gnome-url.h>
-
 #include "em-popup.h"
 #include "libedataserver/e-msgport.h"
 #include "em-utils.h"
@@ -587,13 +585,9 @@ static void
 emp_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data)
 {
 	EMPopupTargetURI *t = (EMPopupTargetURI *)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