From 9185fb32b379bb767de52835a454549e973efa99 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 26 Aug 2005 01:52:55 +0000 Subject: ** See bug #314440. 2005-08-25 Not Zed ** 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 --- mail/em-format-html-display.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'mail/em-format-html-display.c') 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; } -- cgit v1.2.3