diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 12 | ||||
| -rw-r--r-- | mail/folder-browser.c | 2 | ||||
| -rw-r--r-- | mail/mail-format.c | 33 |
3 files changed, 34 insertions, 13 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 321865beb9..f008f36f9b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,15 @@ +2001-12-17 Jon Trowbridge <trow@ximian.com> + + * mail-format.c (attachment_header): Avoid embedding <object> tags + when we are printing. + (handle_multipart_signed): Don't do the click-for-info signature + stuff when we are printing. + (handle_via_bonobo): Don't embed an <object> tag if we are + printing. + + * folder-browser.c: Changed context_menu[] array so that we can + print when the preview pane is closed. + 2001-12-14 Jeffrey Stedfast <fejj@ximian.com> * mail-ops.c (mail_fetch_mail): Set the filter driver's shell-exec diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 8375582553..2f1f5c476d 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -1454,7 +1454,7 @@ static EPopupMenu context_menu[] = { { N_("_Open"), NULL, GTK_SIGNAL_FUNC (open_msg), NULL, 0 }, { N_("_Edit as New Message..."), NULL, GTK_SIGNAL_FUNC (resend_msg), NULL, CAN_RESEND }, { N_("_Save As..."), NULL, GTK_SIGNAL_FUNC (save_msg), NULL, 0 }, - { N_("_Print"), NULL, GTK_SIGNAL_FUNC (print_msg), NULL, SELECTION_SET }, + { N_("_Print"), NULL, GTK_SIGNAL_FUNC (print_msg), NULL, 0 }, E_POPUP_SEPARATOR, diff --git a/mail/mail-format.c b/mail/mail-format.c index 74ffc99a22..b3bd1379b2 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -624,13 +624,19 @@ attachment_header (CamelMimePart *part, const char *mime_type, MailDisplay *md, const char *info; /* Start the table, create the pop-up object. */ - gtk_html_stream_printf (stream, - "<table cellspacing=0 cellpadding=0>" - "<tr><td><table width=10 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>" - "<td><object classid=\"popup:%s\" type=\"%s\"></object></td>" - "<td><table width=3 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>" - "<td><font size=-1>", - get_cid (part, md), mime_type); + mail_html_write (html, stream, + "<table cellspacing=0 cellpadding=0>" + "<tr><td><table width=10 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>"); + + if (! md->printing) { + gtk_html_stream_printf (stream, "<td><object classid=\"popup:%s\" type=\"%s\"></object></td>", + get_cid (part, md), mime_type); + } + + mail_html_write (html, stream, + "<td><table width=3 cellspacing=0 cellpadding=0><tr><td></td></tr></table></td>" + "<td><font size=-1>"); + /* Write the MIME type */ info = gnome_vfs_mime_get_value (mime_type, "description"); @@ -1729,7 +1735,7 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type, subpart = camel_multipart_get_part (mp, i); mail_part_set_default_displayed_inline (subpart, md, FALSE); - if (!mail_part_is_displayed_inline (subpart, md)) { + if (!mail_part_is_displayed_inline (subpart, md) && !md->printing) { char *url; /* Write out the click-for-info object */ @@ -1790,7 +1796,7 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type, } if (message) { - gtk_html_stream_printf (stream, "<font size=-1 %s>", good ? "" : "color=red"); + gtk_html_stream_printf (stream, "<font size=-1 %s>", good || md->printing ? "" : "color=red"); mail_text_write (html, stream, md->printing, message); mail_html_write (html, stream, "</font>"); } @@ -2078,9 +2084,12 @@ static gboolean handle_via_bonobo (CamelMimePart *part, const char *mime_type, MailDisplay *md, GtkHTML *html, GtkHTMLStream *stream) { - gtk_html_stream_printf (stream, - "<object classid=\"%s\" type=\"%s\"></object>", - get_cid (part, md), mime_type); + if (! md->printing) { + gtk_html_stream_printf (stream, + "<object classid=\"%s\" type=\"%s\"></object>", + get_cid (part, md), mime_type); + } + return TRUE; } |