diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/em-config.c | 2 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 12 | ||||
| -rw-r--r-- | mail/em-menu.c | 2 | ||||
| -rw-r--r-- | mail/em-popup.c | 10 |
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 |