evolution r37217 - branches/gnome-2-24/mail

[sragavan svn gnome org]

Author: sragavan
Date: Tue Feb  3 08:39:35 2009
New Revision: 37217
URL: http://svn.gnome.org/viewvc/evolution?rev=37217&view=rev

Log:
2009-02-03  Srinivasa Ragavan  <sragavan novell com>

	** 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:

Modified:
   branches/gnome-2-24/mail/ChangeLog
   branches/gnome-2-24/mail/em-format-html-print.c
   branches/gnome-2-24/mail/em-format-html.c
   branches/gnome-2-24/mail/em-format.c
   branches/gnome-2-24/mail/em-format.h

Modified: branches/gnome-2-24/mail/em-format-html-print.c
==============================================================================
--- branches/gnome-2-24/mail/em-format-html-print.c	(original)
+++ branches/gnome-2-24/mail/em-format-html-print.c	Tue Feb  3 08:39:35 2009
@@ -71,6 +71,7 @@
 	gtk_container_add (GTK_CONTAINER (efhp->window), html);
 	gtk_widget_realize (html);
 	efhp->parent.show_icon = FALSE;
+	((EMFormat *)efhp)->print = TRUE;
 }
 
 GType

Modified: branches/gnome-2-24/mail/em-format-html.c
==============================================================================
--- branches/gnome-2-24/mail/em-format-html.c	(original)
+++ branches/gnome-2-24/mail/em-format-html.c	Tue Feb  3 08:39:35 2009
@@ -1268,7 +1268,7 @@
 		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);
 
 	}

Modified: branches/gnome-2-24/mail/em-format.c
==============================================================================
--- branches/gnome-2-24/mail/em-format.c	(original)
+++ branches/gnome-2-24/mail/em-format.c	Tue Feb  3 08:39:35 2009
@@ -120,6 +120,7 @@
 		(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);

Modified: branches/gnome-2-24/mail/em-format.h
==============================================================================
--- branches/gnome-2-24/mail/em-format.h	(original)
+++ branches/gnome-2-24/mail/em-format.h	Tue Feb  3 08:39:35 2009
@@ -228,6 +228,7 @@
 	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 */
 };