aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-01-11 22:20:50 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-01-11 22:20:50 +0800
commite0610b2e0cea191f631dc825cdc8023cdcd9433d (patch)
tree239b20ce4632d6538b9c664ddec883b6e19c11b5 /widgets/misc
parent59d1f3405c653eb45ca462508d5e6ed968513e42 (diff)
downloadgsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.tar
gsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.tar.gz
gsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.tar.bz2
gsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.tar.lz
gsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.tar.xz
gsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.tar.zst
gsoc2013-evolution-e0610b2e0cea191f631dc825cdc8023cdcd9433d.zip
Continue chipping away at EMFolderView and EMFolderBrowser.
Migrate from gnome_url_show() to e_show_uri(). svn path=/branches/kill-bonobo/; revision=37038
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/e-attachment-bar.c10
-rw-r--r--widgets/misc/e-url-entry.c8
2 files changed, 8 insertions, 10 deletions
diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c
index bdb6852e13..2da9d3541c 100644
--- a/widgets/misc/e-attachment-bar.c
+++ b/widgets/misc/e-attachment-bar.c
@@ -993,7 +993,6 @@ static gboolean
eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy)
{
EAttachment *attachment;
- GError *error = NULL;
gboolean ret = FALSE;
CamelURL *url;
char *path;
@@ -1015,13 +1014,8 @@ eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy)
g_free (path);
}
- /* launch the url now */
- gnome_url_show (attachment->store_uri, &error);
- if (error) {
- g_message ("DEBUG: Launch failed: %s\n", error->message);
- g_error_free (error);
- error = NULL;
- }
+ /* FIXME Pass a parent window. */
+ e_show_uri (NULL, attachment->store_uri);
ret = TRUE;
}
diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c
index 26d081fc85..32490f6590 100644
--- a/widgets/misc/e-url-entry.c
+++ b/widgets/misc/e-url-entry.c
@@ -25,9 +25,9 @@
#endif
#include <gtk/gtk.h>
-#include <libgnome/gnome-url.h>
#include <glib/gi18n.h>
#include "e-url-entry.h"
+#include "e-util/e-util.h"
struct _EUrlEntryPrivate {
GtkWidget *entry;
@@ -170,11 +170,15 @@ button_clicked_cb (GtkWidget *widget, gpointer data)
{
EUrlEntry *url_entry;
EUrlEntryPrivate *priv;
+ const gchar *uri;
url_entry = E_URL_ENTRY (data);
priv = url_entry->priv;
- gnome_url_show (gtk_entry_get_text (GTK_ENTRY (priv->entry)), NULL);
+ uri = gtk_entry_get_text (GTK_ENTRY (priv->entry));
+
+ /* FIXME Pass a parent window. */
+ e_show_uri (NULL, uri);
}
static void