callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid embedding <object> tags when we are printing.

Browse Source 
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.

svn path=/trunk/; revision=15139
This commit is contained in:
Jon Trowbridge
2001-12-17 21:16:30 +00:00
committed by Jon Trowbridge
parent 6977afee94
commit 79d8399544
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mail/ChangeLog
View File

@ -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

2
mail/folder-browser.c
View File

@ -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,

33
mail/mail-format.c
View File

@ -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;
}