Continue chipping away at EMFolderView and EMFolderBrowser.

Migrate from gnome_url_show() to e_show_uri().

svn path=/branches/kill-bonobo/; revision=37038

1 files changed, 6 insertions, 9 deletions

diff --git a/calendar/modules/e-cal-shell-view-memopad.c b/calendar/modules/e-cal-shell-view-memopad.c
index 7c306fd8eb..b78bdd1c50 100644
--- a/calendar/modules/e-cal-shell-view-memopad.c
+++ b/calendar/modules/e-cal-shell-view-memopad.c
@@ -164,14 +164,17 @@ static void
 action_calendar_memopad_open_url_cb (GtkAction *action,
                                      ECalShellView *cal_shell_view)
 {
+	EShellView *shell_view;
+	EShellWindow *shell_window;
 	ECalShellContent *cal_shell_content;
 	EMemoTable *memo_table;
 	ECalModelComponent *comp_data;
 	icalproperty *prop;
-	GdkScreen *screen;
 	const gchar *uri;
 	GSList *list;
-	GError *error = NULL;
+
+	shell_view = E_SHELL_VIEW (cal_shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
 	memo_table = e_cal_shell_content_get_memo_table (cal_shell_content);
@@ -186,14 +189,8 @@ action_calendar_memopad_open_url_cb (GtkAction *action,
 		comp_data->icalcomp, ICAL_URL_PROPERTY);
 	g_return_if_fail (prop == NULL);
 
-	screen = gtk_widget_get_screen (GTK_WIDGET (cal_shell_view));
 	uri = icalproperty_get_url (prop);
-	gtk_show_uri (screen, uri, GDK_CURRENT_TIME, &error);
-
-	if (error != NULL) {
-		g_warning ("%s", error->message);
-		g_error_free (error);
-	}
+	e_show_uri (GTK_WINDOW (shell_window), uri);
 }
 
 static void