From e0610b2e0cea191f631dc825cdc8023cdcd9433d Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Sun, 11 Jan 2009 14:20:50 +0000
Subject: Continue chipping away at EMFolderView and EMFolderBrowser. Migrate
from gnome_url_show() to e_show_uri().
svn path=/branches/kill-bonobo/; revision=37038
---
calendar/gui/dialogs/comp-editor.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
(limited to 'calendar/gui/dialogs/comp-editor.c')
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f3d9eb7b34..3b7f2c5385 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1945,7 +1945,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);
@@ -1970,11 +1969,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); }
@@ -2587,11 +2582,15 @@ comp_editor_get_managed_widget (CompEditor *editor,
CompEditor *
comp_editor_find_instance (const gchar *uid)
{
+ GList *link;
+
g_return_val_if_fail (uid != NULL, NULL);
- return g_list_find_custom (
+ link = g_list_find_custom (
active_editors, uid,
(GCompareFunc) comp_editor_compare);
+
+ return (link != NULL) ? link->data : NULL;
}
/**
--
cgit v1.2.3