aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-format-html-display.c
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2005-08-26 09:52:55 +0800
committerMichael Zucci <zucchi@src.gnome.org>2005-08-26 09:52:55 +0800
commit9185fb32b379bb767de52835a454549e973efa99 (patch)
tree03cca11bef21397f11b78b8800910cf452af69c8 /mail/em-format-html-display.c
parent9bed0d6fee7116e3f2875ecd16fe0f980a2c588b (diff)
downloadgsoc2013-evolution-9185fb32b379bb767de52835a454549e973efa99.tar
gsoc2013-evolution-9185fb32b379bb767de52835a454549e973efa99.tar.gz
gsoc2013-evolution-9185fb32b379bb767de52835a454549e973efa99.tar.bz2
gsoc2013-evolution-9185fb32b379bb767de52835a454549e973efa99.tar.lz
gsoc2013-evolution-9185fb32b379bb767de52835a454549e973efa99.tar.xz
gsoc2013-evolution-9185fb32b379bb767de52835a454549e973efa99.tar.zst
gsoc2013-evolution-9185fb32b379bb767de52835a454549e973efa99.zip
** See bug #314440.
2005-08-25 Not Zed <NotZed@Ximian.com> ** See bug #314440. * em-format-html.c (efh_url_requested): check the content object's mime type, not the container, when seeing if the data should be written. (efh_write_text_html): add some debug. * em-format-html-display.c (efhd_html_button_press_event): fix debug. svn path=/trunk/; revision=30253
Diffstat (limited to 'mail/em-format-html-display.c')
-rw-r--r--mail/em-format-html-display.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 63a5c727c4..0e054f1dca 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -613,26 +613,25 @@ efhd_iframe_created(GtkHTML *html, GtkHTML *iframe, EMFormatHTMLDisplay *efh)
static int
efhd_html_button_press_event (GtkWidget *widget, GdkEventButton *event, EMFormatHTMLDisplay *efhd)
{
- char *url;
+ char *uri;
gboolean res = FALSE;
EMFormatPURI *puri = NULL;
if (event->button != 3)
return FALSE;
- url = gtk_html_get_url_at (GTK_HTML (widget), event->x, event->y);
+ uri = gtk_html_get_url_at (GTK_HTML (widget), event->x, event->y);
d(printf("popup button pressed\n"));
- if (url) {
- puri = em_format_find_puri((EMFormat *)efhd, url);
-
+ if (uri) {
+ puri = em_format_find_puri((EMFormat *)efhd, uri);
d(printf("poup event, uri = '%s' part = '%p'\n", uri, puri?puri->part:NULL));
}
- g_signal_emit((GtkObject *)efhd, efhd_signals[EFHD_POPUP_EVENT], 0, event, url, puri?puri->part:NULL, &res);
+ g_signal_emit((GtkObject *)efhd, efhd_signals[EFHD_POPUP_EVENT], 0, event, uri, puri?puri->part:NULL, &res);
- g_free(url);
+ g_free(uri);
return res;
}