diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-01-11 21:55:04 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-11 21:55:04 +0800 |
| commit | 2b820fc4e2d6404ca281e279761cd5f877fdbf54 (patch) | |
| tree | 58ca39179f9e117dea79e67217e53303ea1f996b /composer | |
| parent | 577f9fdffbbb9e57b44b0290f1aea8088c6f0976 (diff) | |
| download | gsoc2013-evolution-2b820fc4e2d6404ca281e279761cd5f877fdbf54.tar gsoc2013-evolution-2b820fc4e2d6404ca281e279761cd5f877fdbf54.tar.gz gsoc2013-evolution-2b820fc4e2d6404ca281e279761cd5f877fdbf54.tar.bz2 gsoc2013-evolution-2b820fc4e2d6404ca281e279761cd5f877fdbf54.tar.lz gsoc2013-evolution-2b820fc4e2d6404ca281e279761cd5f877fdbf54.tar.xz gsoc2013-evolution-2b820fc4e2d6404ca281e279761cd5f877fdbf54.tar.zst gsoc2013-evolution-2b820fc4e2d6404ca281e279761cd5f877fdbf54.zip | |
New convenience function calls gtk_show_uri() and displays an error dialog
2009-01-11 Matthew Barnes <mbarnes@redhat.com>
* e-util/e-util.c (e_show_uri):
New convenience function calls gtk_show_uri() and displays an
error dialog if the URI cannot be shown.
* addressbook/gui/widgets/eab-contact-display.c
(eab_uri_popup_link_open), (on_link_clicked):
* calendar/gui/e-cal-component-preview (on_link_clicked):
* calendar/gui/e-cal-component-memo-preview (on_link_clicked):
* calendar/gui/e-memo-table.c (open_url_cb):
* calendar/gui/dialogs/comp-editor.c (open_attachment):
* composer/e-msg-composer.c (msg_composer_link_clicked):
* mail/em-folder-view.c (emfv_format_link_clicked):
* mail/em-popup.c (emp_uri_popup_link_open):
* plugins/mailing-list-actions/mailing-list-actions.c
(emla_list_action_do):
* shell/e-shell-window-commands.c (command_open_faq):
* widgets/misc/e-attachment-bar.c (eab_icon_clicked_cb):
* widgets/misc/e-url-entry.c (button_clicked_cb):
Call e_show_uri() instead of gnome_url_show().
* e-util/e-error.c (ee_response):
Call e_display_help() instead of gnome_url_show().
* mail/em-config.c:
* mail/em-menu.c:
Remove unneeded #include <libgnome/gnome-url.h>
svn path=/trunk/; revision=37037
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index cfafbca1bd..dab9cff1a7 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2009-01-11 Matthew Barnes <mbarnes@redhat.com> + + * e-msg-composer.c (msg_composer_link_clicked): + Call e_show_uri() instead of gnome_url_show(). + 2009-01-09 Takao Fujiwara <takao.fujiwara@sun.com> Reviewed by Matthew Barnes <mbarnes@redhat.com> diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index b334e68e34..d13d799ab2 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -56,8 +56,6 @@ #include <gconf/gconf.h> #include <gconf/gconf-client.h> -#include <libgnome/gnome-url.h> - #include <glade/glade.h> #include "e-util/e-dialog-utils.h" @@ -2628,8 +2626,6 @@ static void msg_composer_link_clicked (GtkhtmlEditor *editor, const gchar *uri) { - GError *error = NULL; - if (uri == NULL || *uri == '\0') return; @@ -2642,12 +2638,7 @@ msg_composer_link_clicked (GtkhtmlEditor *editor, if (g_ascii_strncasecmp (uri, "cid:", 4) == 0) return; - gnome_url_show (uri, &error); - - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } + e_show_uri (GTK_WINDOW (editor), uri); } static void |