5 files changed, 12 insertions, 28 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index c7db81e8bb..c3e0e38fed 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -26,6 +26,7 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -34,7 +35,6 @@
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/libgnome.h>
 #include <e-util/e-util.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-util-private.h>
@@ -1975,7 +1975,6 @@ open_attachment (EAttachmentBar *bar, CompEditor *editor)
 	GList *p;
 	int num;
 	char *attach_file_url;
-	GError *error = NULL;
 
 	if (E_IS_ATTACHMENT_BAR (bar)) {
 		icon_list = GNOME_ICON_LIST (bar);
@@ -2000,11 +1999,7 @@ open_attachment (EAttachmentBar *bar, CompEditor *editor)
 			attach_file_url = g_build_path ("/", local_store, filename, NULL);
 
 			/* launch the url now */
-			/* TODO should send GError and handle error conditions
-			 * here */
-			gnome_url_show (attach_file_url, &error);
-			if (error)
-				g_message ("DEBUG: gnome_url_show(%s) failed\n", attach_file_url);
+			e_show_uri (GTK_WINDOW (editor), attach_file_url);
 
 			g_free (filename);
 			g_free (attach_file_url); }
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index 9c3ecd9a0b..3f2e68aba0 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -30,12 +30,12 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-url.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-categories.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 #include <libedataserver/e-time-utils.h>
+#include <e-util/e-util.h>
 #include <e-util/e-categories-config.h>
 #include "calendar-config.h"
 #include "e-cal-component-memo-preview.h"
@@ -54,14 +54,8 @@ G_DEFINE_TYPE (ECalComponentMemoPreview, e_cal_component_memo_preview, GTK_TYPE_
 static void
 on_link_clicked (GtkHTML *html, const char *url, gpointer data)
 {
-        GError *err = NULL;
-
-        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, url);
 }
 
 static void
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 853183bf53..dcc5504311 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -30,12 +30,12 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnome/gnome-url.h>
 #include <libedataserver/e-categories.h>
 #include <libecal/e-cal-time-util.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 #include <libedataserver/e-time-utils.h>
+#include <e-util/e-util.h>
 #include <e-util/e-categories-config.h>
 #include "calendar-config.h"
 #include "e-cal-component-preview.h"
@@ -52,14 +52,8 @@ G_DEFINE_TYPE (ECalComponentPreview, e_cal_component_preview, GTK_TYPE_TABLE)
 static void
 on_link_clicked (GtkHTML *html, const char *url, gpointer data)
 {
-        GError *err = NULL;
-
-        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, url);
 }
 
 static void
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 24e3675b19..450408d228 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1554,7 +1554,8 @@ open_url_cb (EPopup *ep, EPopupItem *pitem, void *data)
 	if (!prop)
 		return;
 
-	gnome_url_show (icalproperty_get_url (prop), NULL);
+	/* FIXME Pass a parent window. */
+	e_show_uri (NULL, icalproperty_get_url (prop));
 }
 
 /* Opens a new task editor */
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index d41901b422..f7a0e52606 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -36,7 +36,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-url.h>
 #include <widgets/misc/e-gui-utils.h>
 #include <table/e-cell-checkbox.h>
 #include <table/e-cell-toggle.h>
@@ -907,7 +906,8 @@ open_url_cb (EPopup *ep, EPopupItem *pitem, void *data)
 	if (!prop)
 		return;
 
-	gnome_url_show (icalproperty_get_url (prop), NULL);
+	/* FIXME Pass a parent window. */
+	e_show_uri (NULL, icalproperty_get_url (prop));
 }
 
 /* Callback for the "delete tasks" menu item */