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 /calendar/gui/dialogs | |
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 'calendar/gui/dialogs')
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index c7db81e8bb..c3e0e38fed 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -26,6 +26,7 @@ #include <config.h> #endif +#include <errno.h> #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> @@ -34,7 +35,6 @@ #include <glib/gi18n-lib.h> #include <glib/gstdio.h> #include <gdk/gdkkeysyms.h> -#include <libgnome/libgnome.h> #include <e-util/e-util.h> #include <e-util/e-dialog-utils.h> #include <e-util/e-util-private.h> @@ -1975,7 +1975,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); @@ -2000,11 +1999,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); } |