From cf9d118d48473c0fe51e2d6514914da18748aa4b Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Tue, 3 Feb 2009 09:11:41 +0000 Subject: ** Fix for bug #569986 2009-02-03 Srinivasa Ragavan ** Fix for bug #569986 * mail/em-format-html-print.c: Handle printers while doing attachment bar rendering. * mail/em-format-html.c: * mail/em-format.c: * mail/em-format.h: svn path=/trunk/; revision=37218 --- mail/ChangeLog | 10 ++++++++++ mail/em-format-html-print.c | 1 + mail/em-format-html.c | 2 +- mail/em-format.c | 1 + mail/em-format.h | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 1885c539e3..998d547fcd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,13 @@ +2009-02-03 Srinivasa Ragavan + + ** Fix for bug #569986 + + * mail/em-format-html-print.c: Handle printers while doing attachment + bar rendering. + * mail/em-format-html.c: + * mail/em-format.c: + * mail/em-format.h: + 2009-02-02 Matt McCutchen 2 ** Fix for bug #567935 diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index a903820ca3..985828d2af 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -71,6 +71,7 @@ efhp_init (GObject *o) gtk_container_add (GTK_CONTAINER (efhp->window), html); gtk_widget_realize (html); efhp->parent.show_icon = FALSE; + ((EMFormat *)efhp)->print = TRUE; } GType diff --git a/mail/em-format-html.c b/mail/em-format-html.c index d6f52275c8..b6ad57c71b 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1268,7 +1268,7 @@ efh_format_exec (struct _format_msg *m) if (handle) handle->handler((EMFormat *)m->format, (CamelStream *)m->estream, (CamelMimePart *)m->message, handle); handle = em_format_find_handler((EMFormat *)m->format, "x-evolution/message/post-header-closure"); - if (handle) + if (handle && !((EMFormat *)m->format)->print) handle->handler((EMFormat *)m->format, (CamelStream *)m->estream, (CamelMimePart *)m->message, handle); } diff --git a/mail/em-format.c b/mail/em-format.c index 048cf6525d..a9ec0935d3 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -120,6 +120,7 @@ emf_init(GObject *o) (GDestroyNotify) NULL, (GDestroyNotify) emf_free_cache); emf->composer = FALSE; + emf->print = FALSE; emf->show_photo = TRUE; emf->photo_local = TRUE; e_dlist_init(&emf->header_list); diff --git a/mail/em-format.h b/mail/em-format.h index 7d4b00b903..1ca0cefb43 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -228,6 +228,7 @@ struct _EMFormat { char *charset; /* charset override */ char *default_charset; /* charset fallback */ gboolean composer; /* Formatting from composer ?*/ + gboolean print; gboolean show_photo; /* Want to show the photo of the sender ?*/ gboolean photo_local; /* Photos only from local addressbooks */ }; -- cgit v1.2.3