Merge lp:~cyphermox/evolution/3.1.3 into lp:~ubuntu-desktop/evolution/ubuntu

[Mathieu Trudel-Lapierre]

[Mathieu Trudel-Lapierre (cyphermox)]

merging..

review: Approve

[lp:~cyphermox/evolution/3.1.3]

215. By Mathieu Trudel-Lapierre on 2011-07-11

releasing version 3.1.3-0ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-28 15:54:12 +0000
+++ debian/changelog	2011-07-11 20:53:51 +0000
@@ -1,3 +1,26 @@
+evolution (3.1.3-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - bgo 652958 - Evolution Account Assistant jumps steps (LP: #799469)
+    - bgo 653154 - Crash when constructing calendar view (LP: #802405)
+    - bgo 649757 - 'Local delivery' accounts stopped working (LP: #781391)
+  * debian/control: bump E-D-S build-depends.
+  * debian/rules: configure with --disable-goa.
+  * debian/patches/99git_camelsession_e-passwords_99d492b.patch: cherry-pick
+    upstream patch to adapt to CamelSession and e-passwords changes.
+  * debian/patches/99git_emformatquote_cleanups_a51ea9b.patch: cherry-pick some
+    cleanup work.
+  * debian/patches/99git_drop_camel_stream_reset_17127fb.patch: cherry-pick
+    upstream patch to replace camel_stream_reset() with g_seekable_seek(),
+    should fix FTBFS.
+  * debian/patches/99git_avoid_camel_stream_printf_005a26d.patch: cherry-pick
+    upstream changes to drop camel_stream_printf() uses.
+  * debian/patches/99git_ealertbar_underalloc_985ad2d.patch: cherry-pick
+    fixes to underallocation of EAlertBar to reduce runtime EShellContent
+    warnings.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 11 Jul 2011 16:47:14 -0400
+
 evolution (3.1.2-0ubuntu2) oneiric; urgency=low
 
   * debian/rules

=== modified file 'debian/control'
--- debian/control	2011-06-24 04:28:56 +0000
+++ debian/control	2011-07-11 20:53:51 +0000
@@ -23,13 +23,13 @@
                libglib2.0-dev (>= 2.28),
                libgtk-3-dev (>= 3.0.2),
                libgail-3-dev (>= 3.0.2),
-               libebook1.2-dev (>= 3.1.2),
-               libecal1.2-dev (>= 3.1.2),
-               libedataserver1.2-dev (>= 3.1.2),
-               libedataserverui-3.0-dev (>= 3.1.2),
-               libebackend1.2-dev (>= 3.1.2),
-               libcamel1.2-dev (>= 3.1.2),
-               evolution-data-server-dev (>= 3.1.2),
+               libebook1.2-dev (>= 3.1.3),
+               libecal1.2-dev (>= 3.1.3),
+               libedataserver1.2-dev (>= 3.1.3),
+               libedataserverui-3.0-dev (>= 3.1.3),
+               libebackend1.2-dev (>= 3.1.3),
+               libcamel1.2-dev (>= 3.1.3),
+               evolution-data-server-dev (>= 3.1.3),
                evolution-data-server-dev (<< 3.2),
                libgtkhtml-4.0-dev (>= 4.1.2),
                libgtkhtml-editor-4.0-dev,
@@ -74,7 +74,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 3.1),
+         evolution-data-server (>= 3.1.3),
          evolution-data-server (<< 3.2),
          gnome-icon-theme (>= 2.30.2.1),
          dbus,

=== added file 'debian/patches/99git_avoid_camel_stream_printf_005a26d.patch'
--- debian/patches/99git_avoid_camel_stream_printf_005a26d.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99git_avoid_camel_stream_printf_005a26d.patch	2011-07-11 20:53:51 +0000
@@ -0,0 +1,1343 @@
+From 005a26de4534cfaf534e8e4828366b619a3b21d1 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <[e-mail]>
+Date: Tue, 05 Jul 2011 18:02:01 +0000
+Subject: Avoid camel_stream_printf().
+
+camel_stream_printf() is next on the chopping block.
+
+Use g_strdup_printf() or a GString to construct a formatted string in
+memory, pass it to camel_stream_write() in one go, and then check for
+errors (unless it's a memory stream).
+---
+diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
+index a5a8d0d..c11476a 100644
+--- a/em-format/em-format-quote.c
++++ b/em-format/em-format-quote.c
+@@ -101,7 +101,8 @@ emfq_format_clone (EMFormat *emf,
+ 	gconf = gconf_client_get_default ();
+ 	if (gconf_client_get_bool (
+ 		gconf, "/apps/evolution/mail/composer/top_signature", NULL))
+-		camel_stream_printf (emfq->priv->stream, "<br>\n");
++		camel_stream_write_string (
++			emfq->priv->stream, "<br>\n", cancellable, NULL);
+ 	g_object_unref (gconf);
+ 	handle = em_format_find_handler(emf, "x-evolution/message/prefix");
+ 	if (handle)
+@@ -274,7 +275,7 @@ em_format_quote_new (const gchar *credits,
+ 
+ static void
+ emfq_format_text_header (EMFormatQuote *emfq,
+-                         CamelStream *stream,
++                         GString *buffer,
+                          const gchar *label,
+                          const gchar *value,
+                          guint32 flags,
+@@ -295,9 +296,11 @@ emfq_format_text_header (EMFormatQuote *emfq,
+ 		html = value;
+ 
+ 	if (flags & EM_FORMAT_HEADER_BOLD)
+-		camel_stream_printf (stream, "<b>%s</b>: %s<br>", label, html);
++		g_string_append_printf (
++			buffer, "<b>%s</b>: %s<br>", label, html);
+ 	else
+-		camel_stream_printf (stream, "%s: %s<br>", label, html);
++		g_string_append_printf (
++			buffer, "%s: %s<br>", label, html);
+ 
+ 	g_free (mhtml);
+ }
+@@ -399,7 +402,7 @@ canon_header_name (gchar *name)
+ 
+ static void
+ emfq_format_header (EMFormat *emf,
+-                    CamelStream *stream,
++                    GString *buffer,
+                     CamelMedium *part,
+                     const gchar *namein,
+                     guint32 flags,
+@@ -482,14 +485,14 @@ emfq_format_header (EMFormat *emf,
+ 		g_free (buf);
+ 	}
+ 
+-	emfq_format_text_header (emfq, stream, label, txt, flags, is_html);
++	emfq_format_text_header (emfq, buffer, label, txt, flags, is_html);
+ 
+ 	g_free (value);
+ }
+ 
+ static void
+ emfq_format_headers (EMFormatQuote *emfq,
+-                     CamelStream *stream,
++                     GString *buffer,
+                      CamelMedium *part)
+ {
+ 	EMFormat *emf = (EMFormat *) emfq;
+@@ -509,11 +512,11 @@ emfq_format_headers (EMFormatQuote *emfq,
+ 	while (link != NULL) {
+ 		EMFormatHeader *h = link->data;
+ 		emfq_format_header (
+-			emf, stream, part, h->name, h->flags, charset);
++			emf, buffer, part, h->name, h->flags, charset);
+ 		link = g_list_next (link);
+ 	}
+ 
+-	camel_stream_printf(stream, "<br>\n");
++	g_string_append (buffer, "<br>\n");
+ }
+ 
+ static void
+@@ -526,9 +529,12 @@ emfq_format_message_prefix (EMFormat *emf,
+ {
+ 	EMFormatQuote *emfq = (EMFormatQuote *) emf;
+ 
+-	if (emfq->priv->credits != NULL)
+-		camel_stream_printf (
+-			stream, "%s<br>\n", emfq->priv->credits);
++	if (emfq->priv->credits != NULL) {
++		camel_stream_write_string (
++			stream, emfq->priv->credits, NULL, NULL);
++		camel_stream_write_string (
++			stream, "<br>\n", NULL, NULL);
++	}
+ }
+ 
+ static void
+@@ -540,20 +546,28 @@ emfq_format_message (EMFormat *emf,
+                      gboolean is_fallback)
+ {
+ 	EMFormatQuote *emfq = (EMFormatQuote *) emf;
++	GString *buffer;
++
++	buffer = g_string_sized_new (1024);
+ 
+ 	if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE)
+-		camel_stream_printf (
+-			stream, "<!--+GtkHTML:<DATA class=\"ClueFlow\" "
++		g_string_append (
++			buffer,
++			"<!--+GtkHTML:<DATA class=\"ClueFlow\" "
+ 			"key=\"orig\" value=\"1\">-->\n"
+ 			"<blockquote type=cite>\n");
+ 
+ 	if (((CamelMimePart *) emf->message) != part) {
+-		camel_stream_printf (
+-			stream,  "%s</br>\n",
++		g_string_append_printf (
++			buffer,
++			"%s</br>\n",
+ 			_("-------- Forwarded Message --------"));
+-		emfq_format_headers (emfq, stream, (CamelMedium *) part);
++		emfq_format_headers (emfq, buffer, (CamelMedium *) part);
+ 	} else if (emfq->priv->flags & EM_FORMAT_QUOTE_HEADERS)
+-		emfq_format_headers (emfq, stream, (CamelMedium *) part);
++		emfq_format_headers (emfq, buffer, (CamelMedium *) part);
++
++	camel_stream_write (
++		stream, buffer->str, buffer->len, cancellable, NULL);
+ 
+ 	em_format_part (emf, stream, part, cancellable);
+ 
+diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
+index c3b5465..1a964e7 100644
+--- a/mail/em-composer-utils.c
++++ b/mail/em-composer-utils.c
+@@ -1926,6 +1926,7 @@ em_utils_send_receipt (EMailSession *session,
+ 	gchar *self_address, *receipt_subject;
+ 	gchar *ua, *recipient;
+ 	gchar *transport_uid;
++	gchar *content;
+ 
+ 	message_id = camel_medium_get_header (
+ 		CAMEL_MEDIUM (message), "Message-ID");
+@@ -1968,15 +1969,17 @@ em_utils_send_receipt (EMailSession *session,
+ 	camel_content_type_set_param (type, "charset", "UTF-8");
+ 	camel_data_wrapper_set_mime_type_field (receipt_text, type);
+ 	camel_content_type_unref (type);
+-	stream = camel_stream_mem_new ();
+-	camel_stream_printf (stream,
+-	/* Translators: First %s is an email address, second %s
+-	 * is the subject of the email, third %s is the date. */
++	content = g_strdup_printf (
++		/* Translators: First %s is an email address, second %s
++		 * is the subject of the email, third %s is the date. */
+ 		_("Your message to %s about \"%s\" on %s has been read."),
+ 		self_address, message_subject, message_date);
++	stream = camel_stream_mem_new ();
++	camel_stream_write_string (stream, content, NULL, NULL);
+ 	camel_data_wrapper_construct_from_stream_sync (
+ 		receipt_text, stream, NULL, NULL);
+ 	g_object_unref (stream);
++	g_free (content);
+ 
+ 	part = camel_mime_part_new ();
+ 	camel_medium_set_content (CAMEL_MEDIUM (part), receipt_text);
+@@ -1999,16 +2002,18 @@ em_utils_send_receipt (EMailSession *session,
+ 	camel_data_wrapper_set_mime_type_field (receipt_data, type);
+ 	camel_content_type_unref (type);
+ 
++	content = g_strdup_printf (
++		"Reporting-UA: %s\n"
++		"Final-Recipient: %s\n"
++		"Original-Message-ID: %s\n"
++		"Disposition: manual-action/MDN-sent-manually; displayed\n",
++		ua, recipient, message_id);
+ 	stream = camel_stream_mem_new ();
+-	camel_stream_printf (stream,
+-			     "Reporting-UA: %s\n"
+-			     "Final-Recipient: %s\n"
+-			     "Original-Message-ID: %s\n"
+-			     "Disposition: manual-action/MDN-sent-manually; displayed\n",
+-			     ua, recipient, message_id);
++	camel_stream_write_string (stream, content, NULL, NULL);
+ 	camel_data_wrapper_construct_from_stream_sync (
+ 		receipt_data, stream, NULL, NULL);
+ 	g_object_unref (stream);
++	g_free (content);
+ 
+ 	g_free (ua);
+ 	g_free (recipient);
+diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
+index 75cb530..90b60ac 100644
+--- a/mail/em-format-html-display.c
++++ b/mail/em-format-html-display.c
+@@ -435,6 +435,7 @@ efhd_format_attachment (EMFormat *emf,
+                         const EMFormatHandler *handle,
+                         GCancellable *cancellable)
+ {
++	GString *buffer;
+ 	gchar *classid, *text, *html;
+ 	struct _attach_puri *info;
+ 
+@@ -458,20 +459,22 @@ efhd_format_attachment (EMFormat *emf,
+ 		info->encrypt = emf->valid->encrypt.status;
+ 	}
+ 
+-	camel_stream_write_string (
+-		stream, EM_FORMAT_HTML_VPAD
+-		"<table cellspacing=0 cellpadding=0><tr><td>"
+-		"<table width=10 cellspacing=0 cellpadding=0>"
+-		"<tr><td></td></tr></table></td>",
+-		cancellable, NULL);
+-
+-	camel_stream_printf (
+-		stream, "<td><object classid=\"%s\"></object></td>", classid);
++	buffer = g_string_sized_new (1024);
+ 
+-	camel_stream_write_string (
+-		stream, "<td><table width=3 cellspacing=0 cellpadding=0>"
+-		"<tr><td></td></tr></table></td><td><font size=-1>",
+-		cancellable, NULL);
++	g_string_append_printf (
++		buffer, EM_FORMAT_HTML_VPAD
++		"<table cellspacing=0 cellpadding=0>"
++		"<tr><td>"
++		"<table width=10 cellspacing=0 cellpadding=0>"
++		"<tr><td></td><tr>"
++		"</table>"
++		"</td>"
++		"<td><object classid=\"%s\"></object></td>"
++		"<td><table width=3 cellspacing=0 cellpadding=0>"
++		"<tr><td></td></tr>"
++		"</table></td>"
++		"<td><font size=-1>",
++		classid);
+ 
+ 	/* output some info about it */
+ 	/* FIXME: should we look up mime_type from object again? */
+@@ -479,13 +482,20 @@ efhd_format_attachment (EMFormat *emf,
+ 	html = camel_text_to_html (
+ 		text, EM_FORMAT_HTML (emf)->text_html_flags &
+ 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+-	camel_stream_write_string (stream, html, cancellable, NULL);
++	g_string_append (buffer, html);
+ 	g_free (html);
+ 	g_free (text);
+ 
+-	camel_stream_write_string (
+-		stream, "</font></td></tr><tr></table>\n"
+-		EM_FORMAT_HTML_VPAD, cancellable, NULL);
++	g_string_append (
++		buffer,
++		"</font></td>"
++		"</tr><tr></table>\n"
++		EM_FORMAT_HTML_VPAD);
++
++	camel_stream_write (
++		stream, buffer->str, buffer->len, cancellable, NULL);
++
++	g_string_free (buffer, TRUE);
+ 
+ 	if (handle && info->shown)
+ 		handle->handler (
+@@ -504,6 +514,7 @@ efhd_format_optional (EMFormat *emf,
+ 	gchar *classid, *html;
+ 	struct _attach_puri *info;
+ 	CamelStream *stream = NULL;
++	GString *buffer;
+ 
+ 	if (CAMEL_IS_STREAM_FILTER (fstream))
+ 		stream = camel_stream_filter_get_source (
+@@ -530,10 +541,12 @@ efhd_format_optional (EMFormat *emf,
+ 		info->encrypt = emf->valid->encrypt.status;
+ 	}
+ 
+-	camel_stream_write_string (
+-		stream, EM_FORMAT_HTML_VPAD
++	buffer = g_string_sized_new (1024);
++
++	g_string_append (
++		buffer, EM_FORMAT_HTML_VPAD
+ 		"<table cellspacing=0 cellpadding=0><tr><td>"
+-		"<h3><font size=-1 color=red>", cancellable, NULL);
++		"<h3><font size=-1 color=red>");
+ 
+ 	html = camel_text_to_html (
+ 		_("Evolution cannot render this email as it is too "
+@@ -541,21 +554,21 @@ efhd_format_optional (EMFormat *emf,
+ 		  "with an external text editor."),
+ 		EM_FORMAT_HTML (emf)->text_html_flags &
+ 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+-	camel_stream_write_string (stream, html, cancellable, NULL);
+-	camel_stream_write_string (
+-		stream, "</font></h3></td></tr></table>\n",
+-		cancellable, NULL);
+-	camel_stream_write_string (
+-		stream, "<table cellspacing=0 cellpadding=0><tr>",
+-		cancellable, NULL);
+-	camel_stream_printf (
+-		stream, "<td><object classid=\"%s\"></object>"
+-		"</td></tr></table>", classid);
+-
++	g_string_append (buffer, html);
+ 	g_free (html);
+ 
+-	camel_stream_write_string (
+-		stream, EM_FORMAT_HTML_VPAD, cancellable, NULL);
++	g_string_append_printf (
++		buffer,
++		"</font></h3></td></tr></table>\n"
++		"<table cellspacing=0 cellpadding=0><tr>"
++		"<td><object classid=\"%s\"></object>"
++		"</td></tr></table>" EM_FORMAT_HTML_VPAD,
++		classid);
++
++	camel_stream_write (
++		stream, buffer->str, buffer->len, cancellable, NULL);
++
++	g_string_free (buffer, TRUE);
+ 
+ 	g_free (classid);
+ }
+@@ -575,11 +588,15 @@ efhd_format_secure (EMFormat *emf,
+ 	if (emf->valid == valid
+ 	    && (valid->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE
+ 		|| valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE)) {
++		GString *buffer;
+ 		gchar *classid;
+ 		struct _smime_pobject *pobj;
+ 
+-		camel_stream_printf (
+-			stream, "<table border=0 width=\"100%%\" "
++		buffer = g_string_sized_new (1024);
++
++		g_string_append_printf (
++			buffer,
++			"<table border=0 width=\"100%%\" "
+ 			"cellpadding=3 cellspacing=0%s><tr>",
+ 			smime_sign_colour[valid->sign.status]);
+ 
+@@ -591,8 +608,9 @@ efhd_format_secure (EMFormat *emf,
+ 			classid, part, efhd_xpkcs7mime_button);
+ 		pobj->valid = camel_cipher_validity_clone (valid);
+ 		pobj->object.free = efhd_xpkcs7mime_free;
+-		camel_stream_printf (
+-			stream, "<td valign=center><object classid=\"%s\">"
++		g_string_append_printf (
++			buffer,
++			"<td valign=center><object classid=\"%s\">"
+ 			"</object></td><td width=100%% valign=center>",
+ 			classid);
+ 		g_free (classid);
+@@ -605,11 +623,13 @@ efhd_format_secure (EMFormat *emf,
+ 			status = valid->sign.status;
+ 			desc = smime_sign_table[status].shortdesc;
+ 
+-			camel_stream_printf (stream, "%s", gettext (desc));
++			g_string_append (buffer, gettext (desc));
+ 
+-			signers = em_format_html_format_cert_infos ((CamelCipherCertInfo *) valid->sign.signers.head);
++			signers = em_format_html_format_cert_infos (
++				(CamelCipherCertInfo *) valid->sign.signers.head);
+ 			if (signers && *signers) {
+-				camel_stream_printf (stream, " (%s)", signers);
++				g_string_append_printf (
++					buffer, " (%s)", signers);
+ 			}
+ 			g_free (signers);
+ 		}
+@@ -618,16 +638,20 @@ efhd_format_secure (EMFormat *emf,
+ 			const gchar *desc;
+ 			gint status;
+ 
+-			if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE) {
+-				camel_stream_printf (stream, "<br>");
+-			}
++			if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE)
++				g_string_append (buffer, "<br>");
+ 
+ 			status = valid->encrypt.status;
+ 			desc = smime_encrypt_table[status].shortdesc;
+-			camel_stream_printf (stream, "%s", gettext (desc));
++			g_string_append (buffer, gettext (desc));
+ 		}
+ 
+-		camel_stream_printf(stream, "</td></tr></table>");
++		g_string_append (buffer, "</td></tr></table>");
++
++		camel_stream_write (
++			stream, buffer->str, buffer->len, cancellable, NULL);
++
++		g_string_free (buffer, TRUE);
+ 	}
+ }
+ 
+@@ -769,14 +793,20 @@ efhd_message_prefix (EMFormat *emf,
+ 	const gchar *flag, *comp, *due;
+ 	time_t date;
+ 	gchar *iconpath, *due_date_str;
++	GString *buffer;
+ 
+ 	if (emf->folder == NULL || emf->uid == NULL
+ 	    || (flag = camel_folder_get_message_user_tag(emf->folder, emf->uid, "follow-up")) == NULL
+ 	    || flag[0] == 0)
+ 		return;
+ 
++	buffer = g_string_sized_new (1024);
++
+ 	/* header displayed for message-flags in mail display */
+-	camel_stream_printf(stream, "<table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
++	g_string_append (
++		buffer,
++		"<table border=1 width=\"100%%\" "
++		"cellspacing=2 cellpadding=2><tr>");
+ 
+ 	comp = camel_folder_get_message_user_tag(emf->folder, emf->uid, "completed-on");
+ 	iconpath = e_icon_factory_get_icon_filename (comp && comp[0] ? "stock_mail-flag-for-followup-done" : "stock_mail-flag-for-followup", GTK_ICON_SIZE_MENU);
+@@ -790,20 +820,33 @@ efhd_message_prefix (EMFormat *emf,
+ 		if (iconpart) {
+ 			gchar *classid;
+ 
+-			classid = g_strdup_printf("icon:///em-format-html-display/%s/%s", emf->part_id->str, comp&&comp[0]?"comp":"uncomp");
+-			camel_stream_printf(stream, "<td align=\"left\"><img src=\"%s\"></td>", classid);
+-			(void) em_format_add_puri (emf, sizeof (EMFormatPURI), classid, iconpart, efhd_write_image);
++			classid = g_strdup_printf (
++				"icon:///em-format-html-display/%s/%s",
++				emf->part_id->str,
++				comp && comp[0] ? "comp" : "uncomp");
++			g_string_append_printf (
++				buffer,
++				"<td align=\"left\">"
++				"<img src=\"%s\"></td>",
++				classid);
++			(void) em_format_add_puri (
++				emf, sizeof (EMFormatPURI),
++				classid, iconpart, efhd_write_image);
+ 			g_free (classid);
+ 			g_object_unref (iconpart);
+ 		}
+ 	}
+ 
+-	camel_stream_printf(stream, "<td align=\"left\" width=\"100%%\">");
++	g_string_append (buffer, "<td align=\"left\" width=\"100%%\">");
+ 
+ 	if (comp && comp[0]) {
+ 		date = camel_header_decode_date (comp, NULL);
+-		due_date_str = e_datetime_format_format ("mail", "header", DTFormatKindDateTime, date);
+-		camel_stream_printf (stream, "%s, %s %s", flag, _("Completed on"), due_date_str ? due_date_str : "???");
++		due_date_str = e_datetime_format_format (
++			"mail", "header", DTFormatKindDateTime, date);
++		g_string_append_printf (
++			buffer, "%s, %s %s",
++			flag, _("Completed on"),
++			due_date_str ? due_date_str : "???");
+ 		g_free (due_date_str);
+ 	} else if ((due = camel_folder_get_message_user_tag(emf->folder, emf->uid, "due-by")) != NULL && due[0]) {
+ 		time_t now;
+@@ -811,16 +854,30 @@ efhd_message_prefix (EMFormat *emf,
+ 		date = camel_header_decode_date (due, NULL);
+ 		now = time (NULL);
+ 		if (now > date)
+-			camel_stream_printf(stream, "<b>%s</b>&nbsp;", _("Overdue:"));
+-
+-		due_date_str = e_datetime_format_format ("mail", "header", DTFormatKindDateTime, date);
+-		/* To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009" */
+-		camel_stream_printf (stream, "%s %s %s", flag, _("by"), due_date_str ? due_date_str : "???");
++			g_string_append_printf (
++				buffer,
++				"<b>%s</b>&nbsp;",
++				_("Overdue:"));
++
++		due_date_str = e_datetime_format_format (
++			"mail", "header", DTFormatKindDateTime, date);
++		/* Translators: the "by" is part of the string,
++		 * like "Follow-up by Tuesday, January 13, 2009" */
++		g_string_append_printf (
++			buffer, "%s %s %s",
++			flag, _("by"),
++			due_date_str ? due_date_str : "???");
++		g_free (due_date_str);
+ 	} else {
+-		camel_stream_printf(stream, "%s", flag);
++		g_string_append (buffer, flag);
+ 	}
+ 
+-	camel_stream_printf(stream, "</td></tr></table>");
++	g_string_append (buffer, "</td></tr></table>");
++
++	camel_stream_write (
++		stream, buffer->str, buffer->len, cancellable, NULL);
++
++	g_string_free (buffer, TRUE);
+ }
+ 
+ /* ********************************************************************** */
+@@ -1053,8 +1110,10 @@ efhd_message_add_bar (EMFormat *emf,
+                       const EMFormatHandler *info)
+ {
+ 	gchar *classid;
++	gchar *content;
+ 
+-	classid = g_strdup_printf ("attachment-bar:%s", emf->current_message_part_id);
++	classid = g_strdup_printf (
++		"attachment-bar:%s", emf->current_message_part_id);
+ 
+ 	/* XXX Apparently this installs the callback for -all-
+ 	 *     EMFormatHTML subclasses, not just this subclass.
+@@ -1065,8 +1124,10 @@ efhd_message_add_bar (EMFormat *emf,
+ 		sizeof (EMFormatHTMLPObject),
+ 		classid, part, efhd_add_bar);
+ 
+-	camel_stream_printf (
+-		stream, "<td><object classid=\"%s\"></object></td>", classid);
++	content = g_strdup_printf (
++		"<td><object classid=\"%s\"></object></td>", classid);
++	camel_stream_write_string (stream, content, NULL, NULL);
++	g_free (content);
+ 
+ 	g_free (classid);
+ }
+diff --git a/mail/em-format-html.c b/mail/em-format-html.c
+index b7b6e4d..4a34aa0 100644
+--- a/mail/em-format-html.c
++++ b/mail/em-format-html.c
+@@ -171,17 +171,19 @@ efh_format_exec (struct _format_msg *m,
+                  GError **error)
+ {
+ 	EMFormat *format;
++	CamelStream *stream;
+ 	struct _EMFormatHTMLJob *job;
+ 	GNode *puri_level;
+ 	CamelURL *base;
++	gchar *content;
+ 
+ 	if (m->format->priv->web_view == NULL)
+ 		return;
+ 
+ 	format = EM_FORMAT (m->format);
++	stream = CAMEL_STREAM (m->estream);
+ 
+-	camel_stream_printf (
+-		(CamelStream *) m->estream,
++	content = g_strdup_printf (
+ 		"<!doctype html public \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n<html>\n"
+ 		"<head>\n<meta name=\"generator\" content=\"Evolution Mail Component\">\n</head>\n"
+ 		"<body bgcolor =\"#%06x\" text=\"#%06x\" marginwidth=6 marginheight=6>\n",
+@@ -191,12 +193,14 @@ efh_format_exec (struct _format_msg *m,
+ 		e_color_to_value (
+ 			&m->format->priv->colors[
+ 			EM_FORMAT_HTML_COLOR_HEADER]));
++	camel_stream_write_string (stream, content, cancellable, NULL);
++	g_free (content);
+ 
+ 	/* <insert top-header stuff here> */
+ 
+ 	if (format->mode == EM_FORMAT_MODE_SOURCE) {
+ 		em_format_format_source (
+-			format, (CamelStream *) m->estream,
++			format, stream,
+ 			(CamelMimePart *) m->message, cancellable);
+ 	} else {
+ 		const EMFormatHandler *handle;
+@@ -207,7 +211,7 @@ efh_format_exec (struct _format_msg *m,
+ 
+ 		if (handle != NULL)
+ 			handle->handler (
+-				format, CAMEL_STREAM (m->estream),
++				format, stream,
+ 				CAMEL_MIME_PART (m->message), handle,
+ 				cancellable, FALSE);
+ 
+@@ -216,12 +220,12 @@ efh_format_exec (struct _format_msg *m,
+ 
+ 		if (handle != NULL)
+ 			handle->handler (
+-				format, CAMEL_STREAM (m->estream),
++				format, stream,
+ 				CAMEL_MIME_PART (m->message), handle,
+ 				cancellable, FALSE);
+ 	}
+ 
+-	camel_stream_flush ((CamelStream *) m->estream, cancellable, NULL);
++	camel_stream_flush (stream, cancellable, NULL);
+ 
+ 	puri_level = format->pending_uri_level;
+ 	base = format->base;
+@@ -704,14 +708,22 @@ efh_format_error (EMFormat *emf,
+                   CamelStream *stream,
+                   const gchar *txt)
+ {
++	GString *buffer;
+ 	gchar *html;
+ 
++	buffer = g_string_new ("<em><font color=\"red\">");
++
+ 	html = camel_text_to_html (
+ 		txt, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
+ 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+-	camel_stream_printf (
+-		stream, "<em><font color=\"red\">%s</font></em><br>", html);
++	g_string_append (buffer, html);
+ 	g_free (html);
++
++	g_string_append (buffer, "</font></em><br>");
++
++	camel_stream_write (stream, buffer->str, buffer->len, NULL, NULL);
++
++	g_string_free (buffer, TRUE);
+ }
+ 
+ static void
+@@ -734,11 +746,13 @@ efh_format_source (EMFormat *emf,
+ 		CAMEL_STREAM_FILTER (filtered_stream), filter);
+ 	g_object_unref (filter);
+ 
+-	camel_stream_write_string (stream, "<table><tr><td><tt>", cancellable, NULL);
+-	em_format_format_text (emf, (CamelStream *) filtered_stream, dw, cancellable);
+-	g_object_unref (filtered_stream);
++	camel_stream_write_string (
++		stream, "<table><tr><td><tt>", cancellable, NULL);
++	em_format_format_text (emf, filtered_stream, dw, cancellable);
++	camel_stream_write_string (
++		stream, "</tt></td></tr></table>", cancellable, NULL);
+ 
+-	camel_stream_write_string(stream, "</tt></td></tr></table>", cancellable, NULL);
++	g_object_unref (filtered_stream);
+ }
+ 
+ static void
+@@ -1725,12 +1739,23 @@ efh_format_secure (EMFormat *emf,
+ 		gchar *classid, *iconpath;
+ 		const gchar *icon;
+ 		CamelMimePart *iconpart;
++		GString *buffer;
++
++		buffer = g_string_sized_new (1024);
+ 
+-		camel_stream_printf (stream, "<table border=0 width=\"100%%\" cellpadding=3 cellspacing=0%s><tr>",
+-				     smime_sign_colour[valid->sign.status]);
++		g_string_append_printf (
++			buffer,
++			"<table border=0 width=\"100%%\" "
++			"cellpadding=3 cellspacing=0%s><tr>",
++			smime_sign_colour[valid->sign.status]);
+ 
+-		classid = g_strdup_printf("smime:///em-format-html/%s/icon/signed", emf->part_id->str);
+-		camel_stream_printf(stream, "<td valign=\"top\"><img src=\"%s\"></td><td valign=\"top\" width=\"100%%\">", classid);
++		classid = g_strdup_printf (
++			"smime:///em-format-html/%s/icon/signed",
++			emf->part_id->str);
++		g_string_append_printf (
++			buffer,
++			"<td valign=\"top\"><img src=\"%s\"></td>"
++			"<td valign=\"top\" width=\"100%%\">", classid);
+ 
+ 		if (valid->sign.status != 0)
+ 			icon = smime_sign_table[valid->sign.status].icon;
+@@ -1748,24 +1773,33 @@ efh_format_secure (EMFormat *emf,
+ 		if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE) {
+ 			gchar *signers;
+ 
+-			camel_stream_printf (stream, "%s", _(smime_sign_table[valid->sign.status].shortdesc));
++			g_string_append (
++				buffer, _(smime_sign_table[valid->sign.status].shortdesc));
+ 
+-			signers = em_format_html_format_cert_infos ((CamelCipherCertInfo *) valid->sign.signers.head);
++			signers = em_format_html_format_cert_infos (
++				(CamelCipherCertInfo *) valid->sign.signers.head);
+ 			if (signers && *signers) {
+-				camel_stream_printf (stream, " (%s)", signers);
++				g_string_append_printf (
++					buffer, " (%s)", signers);
+ 			}
+ 			g_free (signers);
+ 		}
+ 
+ 		if (valid->encrypt.status != CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE) {
+-			if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE) {
+-				camel_stream_printf (stream, "<br>");
+-			}
++			if (valid->sign.status != CAMEL_CIPHER_VALIDITY_SIGN_NONE)
++				g_string_append (buffer, "<br>");
+ 
+-			camel_stream_printf (stream, "%s", _(smime_encrypt_table[valid->encrypt.status].shortdesc));
++			g_string_append (
++				buffer, _(smime_encrypt_table[valid->encrypt.status].shortdesc));
+ 		}
+ 
+-		camel_stream_printf(stream, "</td></tr></table>");
++		g_string_append (buffer, "</td></tr></table>");
++
++		camel_stream_write (
++			stream, buffer->str,
++			buffer->len, cancellable, NULL);
++
++		g_string_free (buffer, TRUE);
+ 	}
+ }
+ 
+@@ -1878,8 +1912,12 @@ efh_text_plain (EMFormat *emf,
+ 
+ 		type = camel_mime_part_get_content_type (newpart);
+ 		if (camel_content_type_is (type, "text", "*") && (is_fallback || !camel_content_type_is (type, "text", "calendar"))) {
+-			camel_stream_printf (
+-				stream, "<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px; color: #%06x;\">\n",
++			gchar *content;
++
++			content = g_strdup_printf (
++				"<div style=\"border: solid #%06x 1px; "
++				"background-color: #%06x; padding: 10px; "
++				"color: #%06x;\">\n<tt>\n" EFH_MESSAGE_START,
+ 				e_color_to_value (
+ 					&efh->priv->colors[
+ 					EM_FORMAT_HTML_COLOR_FRAME]),
+@@ -1890,7 +1928,9 @@ efh_text_plain (EMFormat *emf,
+ 					&efh->priv->colors[
+ 					EM_FORMAT_HTML_COLOR_TEXT]));
+ 			camel_stream_write_string (
+-				stream, "<tt>\n" EFH_MESSAGE_START, cancellable, NULL);
++				stream, content, cancellable, NULL);
++			g_free (content);
++
+ 			em_format_format_text (
+ 				emf, filtered_stream,
+ 				(CamelDataWrapper *) newpart,
+@@ -1921,6 +1961,7 @@ efh_text_enriched (EMFormat *emf,
+ 	CamelStream *filtered_stream;
+ 	CamelMimeFilter *enriched;
+ 	guint32 flags = 0;
++	gchar *content;
+ 
+ 	if (!strcmp(info->mime_type, "text/richtext")) {
+ 		flags = CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT;
+@@ -1939,8 +1980,10 @@ efh_text_enriched (EMFormat *emf,
+ 		CAMEL_STREAM_FILTER (filtered_stream), enriched);
+ 	g_object_unref (enriched);
+ 
+-	camel_stream_printf (
+-		stream, "<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px; color: #%06x;\">\n" EFH_MESSAGE_START,
++	content = g_strdup_printf (
++		"<div style=\"border: solid #%06x 1px; "
++		"background-color: #%06x; padding: 10px; "
++		"color: #%06x;\">\n" EFH_MESSAGE_START,
+ 		e_color_to_value (
+ 			&efh->priv->colors[
+ 			EM_FORMAT_HTML_COLOR_FRAME]),
+@@ -1950,6 +1993,8 @@ efh_text_enriched (EMFormat *emf,
+ 		e_color_to_value (
+ 			&efh->priv->colors[
+ 			EM_FORMAT_HTML_COLOR_TEXT]));
++	camel_stream_write_string (stream, content, cancellable, NULL);
++	g_free (content);
+ 
+ 	em_format_format_text (
+ 		emf, (CamelStream *) filtered_stream,
+@@ -1993,9 +2038,11 @@ efh_text_html (EMFormat *emf,
+ 	EMFormatHTML *efh = EM_FORMAT_HTML (emf);
+ 	const gchar *location;
+ 	gchar *cid = NULL;
++	gchar *content;
+ 
+-	camel_stream_printf (
+-		stream, "<div style=\"border: solid #%06x 1px; background-color: #%06x; color: #%06x;\">\n"
++	content = g_strdup_printf (
++		"<div style=\"border: solid #%06x 1px; "
++		"background-color: #%06x; color: #%06x;\">\n"
+ 		"<!-- text/html -->\n" EFH_MESSAGE_START,
+ 		e_color_to_value (
+ 			&efh->priv->colors[
+@@ -2006,6 +2053,8 @@ efh_text_html (EMFormat *emf,
+ 		e_color_to_value (
+ 			&efh->priv->colors[
+ 			EM_FORMAT_HTML_COLOR_TEXT]));
++	camel_stream_write_string (stream, content, cancellable, NULL);
++	g_free (content);
+ 
+ 	/* TODO: perhaps we don't need to calculate this anymore now base is handled better */
+ 	/* calculate our own location string so add_puri doesn't do it
+@@ -2034,10 +2083,11 @@ efh_text_html (EMFormat *emf,
+ 		emf, sizeof (EMFormatPURI), cid,
+ 		part, efh_write_text_html);
+ 	d(printf("adding iframe, location %s\n", cid));
+-	camel_stream_printf (stream,
+-			    "<iframe src=\"%s\" frameborder=0 scrolling=no>could not get %s</iframe>\n"
+-			    "</div>\n",
+-			    cid, cid);
++	content = g_strdup_printf (
++		"<iframe src=\"%s\" frameborder=0 scrolling=no>"
++		"could not get %s</iframe>\n</div>\n", cid, cid);
++	camel_stream_write_string (stream, content, cancellable, NULL);
++	g_free (content);
+ 	g_free (cid);
+ }
+ 
+@@ -2053,9 +2103,12 @@ efh_message_external (EMFormat *emf,
+ 	CamelContentType *type;
+ 	const gchar *access_type;
+ 	gchar *url = NULL, *desc = NULL;
++	gchar *content;
+ 
+ 	if (!part) {
+-		camel_stream_printf(stream, _("Unknown external-body part."));
++		camel_stream_write_string (
++			stream, _("Unknown external-body part."),
++			cancellable, NULL);
+ 		return;
+ 	}
+ 
+@@ -2063,7 +2116,9 @@ efh_message_external (EMFormat *emf,
+ 	type = camel_mime_part_get_content_type (part);
+ 	access_type = camel_content_type_param (type, "access-type");
+ 	if (!access_type) {
+-		camel_stream_printf(stream, _("Malformed external-body part."));
++		camel_stream_write_string (
++			stream, _("Malformed external-body part."),
++			cancellable, NULL);
+ 		return;
+ 	}
+ 
+@@ -2131,14 +2186,21 @@ efh_message_external (EMFormat *emf,
+ 	} else
+ 		goto fail;
+ 
+-	camel_stream_printf(stream, "<a href=\"%s\">%s</a>", url, desc);
++	content = g_strdup_printf ("<a href=\"%s\">%s</a>", url, desc);
++	camel_stream_write_string (stream, content, cancellable, NULL);
++	g_free (content);
++
+ 	g_free (url);
+ 	g_free (desc);
+ 
+ 	return;
+ 
+ fail:
+-	camel_stream_printf(stream, _("Pointer to unknown external data (\"%s\" type)"), access_type);
++	content = g_strdup_printf (
++		_("Pointer to unknown external data (\"%s\" type)"),
++		access_type);
++	camel_stream_write_string (stream, content, cancellable, NULL);
++	g_free (content);
+ }
+ 
+ static void
+@@ -2153,10 +2215,13 @@ efh_message_deliverystatus (EMFormat *emf,
+ 	CamelStream *filtered_stream;
+ 	CamelMimeFilter *html_filter;
+ 	guint32 rgb = 0x737373;
++	gchar *content;
+ 
+ 	/* Yuck, this is copied from efh_text_plain */
+-	camel_stream_printf (
+-		stream, "<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px; color: #%06x;\">\n",
++	content = g_strdup_printf (
++		"<div style=\"border: solid #%06x 1px; "
++		"background-color: #%06x; padding: 10px; "
++		"color: #%06x;\">\n",
+ 		e_color_to_value (
+ 			&efh->priv->colors[
+ 			EM_FORMAT_HTML_COLOR_FRAME]),
+@@ -2166,6 +2231,8 @@ efh_message_deliverystatus (EMFormat *emf,
+ 		e_color_to_value (
+ 			&efh->priv->colors[
+ 			EM_FORMAT_HTML_COLOR_TEXT]));
++	camel_stream_write_string (stream, content, cancellable, NULL);
++	g_free (content);
+ 
+ 	filtered_stream = camel_stream_filter_new (stream);
+ 	html_filter = camel_mime_filter_tohtml_new (efh->text_html_flags, rgb);
+@@ -2346,11 +2413,15 @@ efh_image (EMFormat *emf,
+            gboolean is_fallback)
+ {
+ 	EMFormatPURI *puri;
++	gchar *content;
+ 
+ 	puri = em_format_add_puri (
+ 		emf, sizeof (EMFormatPURI), NULL, part, efh_write_image);
+-	camel_stream_printf (
+-		stream, "<img hspace=10 vspace=10 src=\"%s\">", puri->cid);
++
++	content = g_strdup_printf (
++		"<img hspace=10 vspace=10 src=\"%s\">", puri->cid);
++	camel_stream_write_string (stream, content, cancellable, NULL);
++	g_free (content);
+ }
+ 
+ /* Notes:
+@@ -2415,7 +2486,11 @@ efh_builtin_init (EMFormatHTMLClass *efhc)
+ /* ********************************************************************** */
+ 
+ static void
+-efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const gchar *label, const gchar *value, guint32 flags)
++efh_format_text_header (EMFormatHTML *emfh,
++                        GString *buffer,
++                        const gchar *label,
++                        const gchar *value,
++                        guint32 flags)
+ {
+ 	const gchar *fmt, *html;
+ 	gchar *mhtml = NULL;
+@@ -2463,7 +2538,8 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const gchar *la
+ 		}
+ 	}
+ 
+-	camel_stream_printf (stream, fmt, label, html);
++	g_string_append_printf (buffer, fmt, label, html);
++
+ 	g_free (mhtml);
+ }
+ 
+@@ -2615,7 +2691,12 @@ canon_header_name (gchar *name)
+ }
+ 
+ static void
+-efh_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, struct _camel_header_raw *header, guint32 flags, const gchar *charset)
++efh_format_header (EMFormat *emf,
++                   GString *buffer,
++                   CamelMedium *part,
++                   struct _camel_header_raw *header,
++                   guint32 flags,
++                   const gchar *charset)
+ {
+ 	EMFormatHTML *efh = (EMFormatHTML *) emf;
+ 	gchar *name, *buf, *value = NULL;
+@@ -2758,7 +2839,7 @@ efh_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
+ 		g_free (buf);
+ 	}
+ 
+-	efh_format_text_header (efh, stream, label, txt, flags);
++	efh_format_text_header (efh, buffer, label, txt, flags);
+ 
+ 	g_free (value);
+ 	g_free (str_field);
+@@ -2766,7 +2847,7 @@ efh_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
+ 
+ static void
+ efh_format_headers (EMFormatHTML *efh,
+-                    CamelStream *stream,
++                    GString *buffer,
+                     CamelMedium *part,
+                     GCancellable *cancellable)
+ {
+@@ -2793,8 +2874,8 @@ efh_format_headers (EMFormatHTML *efh,
+ 	charset = camel_iconv_charset_name (charset);
+ 
+ 	if (!efh->simple_headers)
+-		camel_stream_printf (
+-			stream, "<font color=\"#%06x\">\n"
++		g_string_append_printf (
++			buffer, "<font color=\"#%06x\">\n"
+ 			"<table cellpadding=\"0\" width=\"100%%\">",
+ 			e_color_to_value (
+ 				&efh->priv->colors[
+@@ -2833,15 +2914,27 @@ efh_format_headers (EMFormatHTML *efh,
+ 			header = header->next;
+ 		}
+ 
+-		camel_stream_printf (stream, "<tr><td width=\"20\" valign=\"top\"><a href=\"##HEADERS##\"><img src=\"%s/plus.png\"></a></td><td><strong>%s</strong> %s%s%s</td></tr>",
+-				evolution_imagesdir,  subject ? subject : _("(no subject)"), from->len ? "(" : "", from->str, from->len ? ")" : "");
++		g_string_append_printf (
++			buffer,
++			"<tr>"
++			"<td width=\"20\" valign=\"top\">"
++			"<a href=\"##HEADERS##\">"
++			"<img src=\"%s/plus.png\">"
++			"</a></td>"
++			"<td><strong>%s</strong> %s%s%s</td>"
++			"</tr>",
++			evolution_imagesdir,
++			subject ? subject : _("(no subject)"),
++			from->len ? "(" : "",
++			from->str,
++			from->len ? ")" : "");
+ 
+ 		g_free (subject);
+ 		if (addrs)
+ 			camel_header_address_list_clear (&addrs);
+ 		g_string_free (from, TRUE);
+ 
+-		camel_stream_printf (stream, "</table>");
++		g_string_append (buffer, "</table>");
+ 
+ 		g_free (evolution_imagesdir);
+ 
+@@ -2889,17 +2982,27 @@ efh_format_headers (EMFormatHTML *efh,
+ 
+ 	if (header_sender && header_from && mail_from_delegate) {
+ 		gchar *bold_sender, *bold_from;
+-		camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
++
++		g_string_append (
++			buffer,
++			"<tr><td><table border=1 width=\"100%%\" "
++			"cellspacing=2 cellpadding=2><tr>");
+ 		if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
+-			camel_stream_printf (stream, "<td align=\"right\" width=\"100%%\">");
++			g_string_append (
++				buffer, "<td align=\"right\" width=\"100%%\">");
+ 		else
+-			camel_stream_printf (stream, "<td align=\"left\" width=\"100%%\">");
++			g_string_append (
++				buffer, "<td align=\"left\" width=\"100%%\">");
+ 		bold_sender = g_strconcat ("<b>", header_sender, "</b>", NULL);
+ 		bold_from = g_strconcat ("<b>", header_from, "</b>", NULL);
+-		/* To translators: This message suggests to the receipients that the sender of the mail is
+-		   different from the one listed in From field. */
+-		camel_stream_printf(stream, _("This message was sent by %s on behalf of %s"), bold_sender, bold_from);
+-		camel_stream_printf(stream, "</td></tr></table></td></tr>");
++		/* Translators: This message suggests to the receipients
++		 * that the sender of the mail is different from the one
++		 * listed in From field. */
++		g_string_append_printf (
++			buffer,
++			_("This message was sent by %s on behalf of %s"),
++			bold_sender, bold_from);
++		g_string_append (buffer, "</td></tr></table></td></tr>");
+ 		g_free (bold_sender);
+ 		g_free (bold_from);
+ 	}
+@@ -2909,17 +3012,39 @@ efh_format_headers (EMFormatHTML *efh,
+ 
+ 	if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) {
+ 		if (efh->priv->headers_collapsable)
+-			camel_stream_printf (stream, "<tr><td valign=\"top\" width=\"20\"><a href=\"##HEADERS##\"><img src=\"%s/minus.png\"></a></td><td><table width=\"100%%\" border=0 cellpadding=\"0\">\n",
++			g_string_append_printf (
++				buffer,
++				"<tr>"
++				"<td valign=\"top\" width=\"20\">"
++				"<a href=\"##HEADERS##\">"
++				"<img src=\"%s/minus.png\">"
++				"</a></td>"
++				"<td><table width=\"100%%\" border=0 "
++				"cellpadding=\"0\">\n",
+ 				evolution_imagesdir);
+ 		else
+-			camel_stream_printf (stream, "<tr><td><table width=\"100%%\" border=0 cellpadding=\"0\">\n");
++			g_string_append (
++				buffer,
++				"<tr><td>"
++				"<table width=\"100%%\" border=0 "
++				"cellpadding=\"0\">\n");
+ 
+ 	} else {
+ 		if (efh->priv->headers_collapsable)
+-			camel_stream_printf (stream, "<tr><td valign=\"top\" width=\"20\"><a href=\"##HEADERS##\"><img src=\"%s/minus.png\"></a></td><td><table border=0 cellpadding=\"0\">\n",
++			g_string_append_printf (
++				buffer,
++				"<tr>"
++				"<td valign=\"top\" width=\"20\">"
++				"<a href=\"##HEADERS##\">"
++				"<img src=\"%s/minus.png\">"
++				"</a></td>"
++				"<td><table border=0 cellpadding=\"0\">\n",
+ 				evolution_imagesdir);
+ 		else
+- 			camel_stream_printf (stream, "<tr><td><table border=0 cellpadding=\"0\">\n");
++			g_string_append (
++				buffer,
++ 				"<tr><td>"
++				"<table border=0 cellpadding=\"0\">\n");
+ 	}
+ 
+ 	g_free (evolution_imagesdir);
+@@ -2928,7 +3053,9 @@ efh_format_headers (EMFormatHTML *efh,
+ 	if (emf->mode == EM_FORMAT_MODE_ALLHEADERS) {
+ 		header = ((CamelMimePart *) part)->headers;
+ 		while (header) {
+-			efh_format_header (emf, stream, part, header, EM_FORMAT_HTML_HEADER_NOCOLUMNS, charset);
++			efh_format_header (
++				emf, buffer, part, header,
++				EM_FORMAT_HTML_HEADER_NOCOLUMNS, charset);
+ 			header = header->next;
+ 		}
+ 	} else {
+@@ -2974,7 +3101,9 @@ efh_format_headers (EMFormatHTML *efh,
+ 					xmailer.value = use_header->value;
+ 					mailer_shown = TRUE;
+ 
+-					efh_format_header (emf, stream, part, &xmailer, h->flags, charset);
++					efh_format_header (
++						emf, buffer, part,
++						&xmailer, h->flags, charset);
+ 					if (strstr(use_header->value, "Evolution"))
+ 						have_icon = TRUE;
+ 				} else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) {
+@@ -2990,7 +3119,9 @@ efh_format_headers (EMFormatHTML *efh,
+ 					face_decoded = TRUE;
+ 				/* Showing an encoded "Face" header makes little sense */
+ 				} else if (!g_ascii_strcasecmp (header->name, h->name) && !face) {
+-					efh_format_header (emf, stream, part, header, h->flags, charset);
++					efh_format_header (
++						emf, buffer, part,
++						header, h->flags, charset);
+ 				}
+ 
+ 				header = header->next;
+@@ -3001,7 +3132,7 @@ efh_format_headers (EMFormatHTML *efh,
+ 	}
+ 
+ 	if (!efh->simple_headers) {
+-		camel_stream_printf(stream, "</table></td>");
++		g_string_append (buffer, "</table></td>");
+ 
+ 		if (photo_name) {
+ 			gchar *classid;
+@@ -3015,10 +3146,13 @@ efh_format_headers (EMFormatHTML *efh,
+ 
+ 			if (photopart) {
+ 				contact_has_photo = TRUE;
+-				classid = g_strdup_printf("icon:///em-format-html/%s/photo/header",
+-				emf->part_id->str);
+-				camel_stream_printf (stream,
+-					"<td align=\"right\" valign=\"top\"><img width=64 src=\"%s\"></td>",
++				classid = g_strdup_printf (
++					"icon:///em-format-html/%s/photo/header",
++					emf->part_id->str);
++				g_string_append_printf (
++					buffer,
++					"<td align=\"right\" valign=\"top\">"
++					"<img width=64 src=\"%s\"></td>",
+ 					classid);
+ 				em_format_add_puri (emf, sizeof (EMFormatPURI), classid,
+ 					photopart, efh_write_image);
+@@ -3034,9 +3168,17 @@ efh_format_headers (EMFormatHTML *efh,
+ 			CamelMimePart *part;
+ 
+ 			part = camel_mime_part_new ();
+-			camel_mime_part_set_content ((CamelMimePart *) part, (const gchar *) face_header_value, face_header_len, "image/png");
+-			classid = g_strdup_printf("icon:///em-format-html/face/photo/header");
+-			camel_stream_printf(stream, "<td align=\"right\" valign=\"top\"><img width=48 src=\"%s\"></td>", classid);
++			camel_mime_part_set_content (
++				(CamelMimePart *) part,
++				(const gchar *) face_header_value,
++				face_header_len, "image/png");
++			classid = g_strdup_printf (
++				"icon:///em-format-html/face/photo/header");
++			g_string_append_printf (
++				buffer,
++				"<td align=\"right\" valign=\"top\">"
++				"<img width=48 src=\"%s\"></td>",
++				classid);
+ 			em_format_add_puri (
+ 				emf, sizeof (EMFormatPURI),
+ 				classid, part, efh_write_image);
+@@ -3048,8 +3190,14 @@ efh_format_headers (EMFormatHTML *efh,
+ 			gchar *classid;
+ 			CamelMimePart *iconpart = NULL;
+ 
+-			classid = g_strdup_printf("icon:///em-format-html/%s/icon/header", emf->part_id->str);
+-			camel_stream_printf(stream, "<td align=\"right\" valign=\"top\"><img width=16 height=16 src=\"%s\"></td>", classid);
++			classid = g_strdup_printf (
++				"icon:///em-format-html/%s/icon/header",
++				emf->part_id->str);
++			g_string_append_printf (
++				buffer,
++				"<td align=\"right\" valign=\"top\">"
++				"<img width=16 height=16 src=\"%s\"></td>",
++				classid);
+ 
+ 			icon_info = gtk_icon_theme_lookup_icon (
+ 				gtk_icon_theme_get_default (),
+@@ -3070,7 +3218,8 @@ efh_format_headers (EMFormatHTML *efh,
+ 			}
+ 			g_free (classid);
+ 		}
+-		camel_stream_printf (stream, "</tr></table>\n</font>\n");
++
++		g_string_append (buffer, "</tr></table>\n</font>\n");
+ 	}
+ }
+ 
+@@ -3083,6 +3232,7 @@ efh_format_message (EMFormat *emf,
+                     gboolean is_fallback)
+ {
+ 	const EMFormatHandler *handle;
++	GString *buffer;
+ 
+ 	/* TODO: make this validity stuff a method */
+ 	EMFormatHTML *efh = (EMFormatHTML *) emf;
+@@ -3091,23 +3241,32 @@ efh_format_message (EMFormat *emf,
+ 	emf->valid = NULL;
+ 	emf->valid_parent = NULL;
+ 
++	buffer = g_string_sized_new (1024);
++
+ 	if (emf->message != (CamelMimeMessage *) part)
+-		camel_stream_printf(stream, "<blockquote>\n");
++		g_string_append (buffer, "<blockquote>\n");
+ 
+ 	if (!efh->hide_headers)
+ 		efh_format_headers (
+-			efh, stream, CAMEL_MEDIUM (part), cancellable);
++			efh, buffer, CAMEL_MEDIUM (part), cancellable);
++
++	camel_stream_write (
++		stream, buffer->str, buffer->len, cancellable, NULL);
++
++	g_string_free (buffer, TRUE);
+ 
+ 	handle = em_format_find_handler(emf, "x-evolution/message/post-header");
+ 	if (handle)
+ 		handle->handler (
+ 			emf, stream, part, handle, cancellable, FALSE);
+ 
+-	camel_stream_printf (stream, EM_FORMAT_HTML_VPAD);
++	camel_stream_write_string (
++		stream, EM_FORMAT_HTML_VPAD, cancellable, NULL);
+ 	em_format_part (emf, stream, part, cancellable);
+ 
+ 	if (emf->message != (CamelMimeMessage *) part)
+-		camel_stream_printf(stream, "</blockquote>\n");
++		camel_stream_write_string (
++			stream, "</blockquote>\n", cancellable, NULL);
+ 
+ 	camel_cipher_validity_free (emf->valid);
+ 
+diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
+index 507bc95..07b1bd6 100644
+--- a/plugins/audio-inline/audio-inline.c
++++ b/plugins/audio-inline/audio-inline.c
+@@ -294,16 +294,22 @@ void
+ org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t)
+ {
+ 	struct _org_gnome_audio_inline_pobject *pobj;
+-	gchar *classid = g_strdup_printf ("org-gnome-audio-inline-button-panel-%d", org_gnome_audio_class_id_counter);
++	gchar *classid;
++	gchar *content;
++
++	classid = g_strdup_printf (
++		"org-gnome-audio-inline-button-panel-%d",
++		org_gnome_audio_class_id_counter);
+ 
+ 	org_gnome_audio_class_id_counter++;
+ 
+ 	d(printf ("audio inline formatter: format classid %s\n", classid));
+ 
+-	pobj = (struct _org_gnome_audio_inline_pobject *) em_format_html_add_pobject ((EMFormatHTML *) t->format, sizeof (*pobj), classid,
+-										      t->part, org_gnome_audio_inline_button_panel);
+-	g_object_ref (t->part);
+-	pobj->part = t->part;
++	pobj = (struct _org_gnome_audio_inline_pobject *)
++		em_format_html_add_pobject (
++			(EMFormatHTML *) t->format, sizeof (*pobj), classid,
++			t->part, org_gnome_audio_inline_button_panel);
++	pobj->part = g_object_ref (t->part);
+ 	pobj->filename = NULL;
+ 	pobj->playbin = NULL;
+ 	pobj->play_button = NULL;
+@@ -313,5 +319,7 @@ org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t)
+ 	pobj->object.free = org_gnome_audio_inline_pobject_free;
+ 	pobj->target_state = GST_STATE_NULL;
+ 
+-	camel_stream_printf (t->stream, "<object classid=%s></object>\n", classid);
++	content = g_strdup_printf ("<object classid=%s></object>\n", classid);
++	camel_stream_write_string (t->stream, content, NULL, NULL);
++	g_free (content);
+ }
+diff --git a/plugins/image-inline/image-inline.c b/plugins/image-inline/image-inline.c
+index edb527c..73a630a 100644
+--- a/plugins/image-inline/image-inline.c
++++ b/plugins/image-inline/image-inline.c
+@@ -448,6 +448,7 @@ org_gnome_image_inline_format (gpointer ep, EMFormatHookTarget *target)
+ {
+ 	ImageInlinePObject *image_object;
+ 	gchar *classid;
++	gchar *content;
+ 
+ 	classid = g_strdup_printf (
+ 		"org-gnome-image-inline-display-%d",
+@@ -466,8 +467,9 @@ org_gnome_image_inline_format (gpointer ep, EMFormatHookTarget *target)
+ 	image_object->object.free = org_gnome_image_inline_pobject_free;
+ 	org_gnome_image_inline_decode (image_object);
+ 
+-	camel_stream_printf (
+-		target->stream, "<object classid=%s></object>", classid);
++	content = g_strdup_printf ("<object classid=%s></object>", classid);
++	camel_stream_write_string (target->stream, content, NULL, NULL);
++	g_free (content);
+ 
+ 	g_free (classid);
+ }
+diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
+index 0770ea2..f5b2bcd 100644
+--- a/plugins/itip-formatter/itip-formatter.c
++++ b/plugins/itip-formatter/itip-formatter.c
+@@ -2819,6 +2819,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
+ 	CamelDataWrapper *content;
+ 	CamelStream *stream;
+ 	GByteArray *byte_array;
++	gchar *string;
+ 
+ 	classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str);
+ 
+@@ -2859,9 +2860,13 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
+ 
+ 	g_object_unref (stream);
+ 
+-	camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>");
+-	camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid);
+-	camel_stream_printf (target->stream, "</td></tr></table>");
++	string = g_strdup_printf (
++		"<table border=0 width=\"100%%\" cellpadding=3><tr>"
++		"<td valign=top><object classid=\"%s\"></object></td>"
++		"<td width=100%% valign=top></td></tr></table>",
++		classid);
++	camel_stream_write_string (target->stream, string, NULL, NULL);
++	g_free (string);
+ 
+ 	g_free (classid);
+ }
+diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
+index 7e56da4..78818f3 100644
+--- a/plugins/vcard-inline/vcard-inline.c
++++ b/plugins/vcard-inline/vcard-inline.c
+@@ -313,6 +313,7 @@ org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target)
+ {
+ 	VCardInlinePObject *vcard_object;
+ 	gchar *classid;
++	gchar *content;
+ 
+ 	classid = g_strdup_printf (
+ 		"org-gnome-vcard-inline-display-%d",
+@@ -332,8 +333,9 @@ org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target)
+ 
+ 	e_book_client_get_sources (&vcard_object->source_list, NULL);
+ 
+-	camel_stream_printf (
+-		target->stream, "<object classid=%s></object>", classid);
++	content = g_strdup_printf ("<object classid=%s></object>", classid);
++	camel_stream_write_string (target->stream, content, NULL, NULL);
++	g_free (content);
+ 
+ 	g_free (classid);
+ }
+--
+cgit v0.9

=== added file 'debian/patches/99git_camelsession_e-passwords_99d492b.patch'
--- debian/patches/99git_camelsession_e-passwords_99d492b.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99git_camelsession_e-passwords_99d492b.patch	2011-07-11 20:53:51 +0000
@@ -0,0 +1,313 @@
+From 99d492b8284fa467f2b8ad3e6b637e10258d1cc2 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <[e-mail]>
+Date: Mon, 04 Jul 2011 13:55:30 +0000
+Subject: Adapt to CamelSession and e-passwords changes.
+
+---
+diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
+index 28b10ff..0de79ef 100644
+--- a/calendar/gui/alarm-notify/alarm-notify.c
++++ b/calendar/gui/alarm-notify/alarm-notify.c
+@@ -383,12 +383,8 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalClientSourceType source_type,  E
+ 	   session skip this source loading. we do not really want to prompt for auth from alarm dameon*/
+ 
+ 	if (e_source_get_property (source, "auth")) {
+-		const gchar *name = e_source_get_property (source, "auth-domain");
+ 
+-		if (!name)
+-			name = "Calendar";
+-
+-		if (!e_passwords_get_password (name, pass_key)) {
++		if (!e_passwords_get_password (NULL, pass_key)) {
+ 			g_mutex_unlock (an->priv->mutex);
+ 			g_free (str_uri);
+ 			g_free (pass_key);
+diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
+index ca4df0b..5395803 100644
+--- a/calendar/gui/e-meeting-store.c
++++ b/calendar/gui/e-meeting-store.c
+@@ -1809,7 +1809,7 @@ soup_authenticate (SoupSession *session,
+ 		} else {
+ 			gchar *password;
+ 
+-			password = e_passwords_get_password ("Calendar", orig_uri);
++			password = e_passwords_get_password (NULL, orig_uri);
+ 			if (password) {
+ 				soup_auth_authenticate (auth, suri->user, password);
+ 				tried = TRUE;
+@@ -1846,7 +1846,7 @@ soup_authenticate (SoupSession *session,
+ 		}
+ 
+ 		password = e_passwords_ask_password (
+-			_("Enter password"), "Calendar", orig_uri,
++			_("Enter password"), NULL, orig_uri,
+ 			description->str, E_PASSWORDS_REMEMBER_FOREVER |
+ 			E_PASSWORDS_SECRET | E_PASSWORDS_ONLINE |
+ 			(retrying ? E_PASSWORDS_REPROMPT : 0),
+diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
+index 6328dbc..0290cd7 100644
+--- a/capplet/settings/mail-account-view.c
++++ b/capplet/settings/mail-account-view.c
+@@ -278,7 +278,7 @@ setup_yahoo_account (MailAccountView *mav)
+ 
+ 		abs_uri = g_strdup_printf ("caldav://[e-mail]/dav/%s/Calendar/%s/", sanitize_uname, email,  gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry));
+ 		e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *) mav->password));
+-		e_passwords_remember_password ("Calendar", abs_uri);
++		e_passwords_remember_password (NULL, abs_uri);
+ 
+ 		rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text ((GtkEntry *) mav->priv->yahoo_cal_entry));
+ 		e_source_set_relative_uri (calendar, rel_uri);
+@@ -328,7 +328,7 @@ setup_yahoo_account (MailAccountView *mav)
+ 
+ 		rel_uri = g_strdup_printf("google://%s/", mav->priv->username);
+ 		e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password));
+-		e_passwords_remember_password ("Addressbook", rel_uri);
++		e_passwords_remember_password (NULL, rel_uri);
+ 		e_source_group_add_source (sgrp, abook, -1);
+ 		e_source_list_sync (slist, NULL);
+ 
+@@ -379,7 +379,7 @@ setup_google_accounts (MailAccountView *mav)
+ 		e_source_set_absolute_uri (calendar, abs_uri);
+ 
+ 		e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *) mav->password));
+-		e_passwords_remember_password ("Calendar", abs_uri);
++		e_passwords_remember_password (NULL, abs_uri);
+ 		rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL);
+ 		e_source_set_relative_uri (calendar, rel_uri);
+ 
+@@ -447,7 +447,7 @@ setup_google_accounts (MailAccountView *mav)
+ 
+ 			rel_uri = g_strdup_printf ("google://%s/", mav->priv->username);
+ 			e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password));
+-			e_passwords_remember_password ("Addressbook", rel_uri);
++			e_passwords_remember_password (NULL, rel_uri);
+ 			e_source_list_sync (slist, NULL);
+ 
+ 			g_free (rel_uri);
+@@ -688,7 +688,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
+ 			aurl = camel_url_new (account->source->url, NULL);
+ 			surl = camel_url_to_string (aurl, CAMEL_URL_HIDE_ALL);
+ 			e_passwords_add_password (surl, gtk_entry_get_text ((GtkEntry *) mav->password));
+-			e_passwords_remember_password ("Mail", surl);
++			e_passwords_remember_password (NULL, surl);
+ 			camel_url_free (aurl);
+ 			g_free (surl);
+ 		}
+diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
+index 1a3b9e8..44bbd8d 100644
+--- a/mail/e-mail-session.c
++++ b/mail/e-mail-session.c
+@@ -609,7 +609,6 @@ mail_session_finalize (GObject *object)
+ static gchar *
+ mail_session_get_password (CamelSession *session,
+                            CamelService *service,
+-                           const gchar *domain,
+                            const gchar *prompt,
+                            const gchar *item,
+                            guint32 flags,
+@@ -631,10 +630,7 @@ mail_session_get_password (CamelSession *session,
+ 		gchar *key = mail_session_make_key (service, item);
+ 		EAccountService *config_service = NULL;
+ 
+-		if (domain == NULL)
+-			domain = "Mail";
+-
+-		ret = e_passwords_get_password (domain, key);
++		ret = e_passwords_get_password (NULL, key);
+ 		if (ret == NULL || (flags & CAMEL_SESSION_PASSWORD_REPROMPT)) {
+ 			gboolean remember;
+ 
+@@ -696,11 +692,11 @@ mail_session_get_password (CamelSession *session,
+ 					eflags |= E_PASSWORDS_DISABLE_REMEMBER;
+ 
+ 				ret = e_passwords_ask_password (
+-					title, domain, key, prompt,
++					title, NULL, key, prompt,
+ 					eflags, &remember, NULL);
+ 
+ 				if (!ret)
+-					e_passwords_forget_password (domain, key);
++					e_passwords_forget_password (NULL, key);
+ 
+ 				g_free (title);
+ 
+@@ -729,16 +725,14 @@ mail_session_get_password (CamelSession *session,
+ static gboolean
+ mail_session_forget_password (CamelSession *session,
+                               CamelService *service,
+-                              const gchar *domain,
+                               const gchar *item,
+                               GError **error)
+ {
+ 	gchar *key;
+ 
+-	domain = (domain != NULL) ? domain : "Mail";
+ 	key = mail_session_make_key (service, item);
+ 
+-	e_passwords_forget_password (domain, key);
++	e_passwords_forget_password (NULL, key);
+ 
+ 	g_free (key);
+ 
+diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
+index c6bef76..867a837 100644
+--- a/mail/em-account-editor.c
++++ b/mail/em-account-editor.c
+@@ -3838,19 +3838,14 @@ forget_password_if_needed (EAccount *original_account, EAccount *modified_accoun
+ 	    (orig_url && !modif_url)) {
+ 		CamelURL *url;
+ 		gchar *url_str;
+-		const gchar *auth_domain;
+ 
+ 		url = camel_url_new (orig_url, NULL);
+ 		if (!url)
+ 			return;
+ 
+-		auth_domain = camel_url_get_param (url, "auth-domain");
+-		if (!auth_domain)
+-			auth_domain = "Mail";
+-
+ 		url_str = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
+ 		if (url_str)
+-			e_passwords_forget_password (auth_domain, url_str);
++			e_passwords_forget_password (NULL, url_str);
+ 
+ 		g_free (url_str);
+ 		camel_url_free (url);
+diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
+index d169dda..72985f4 100644
+--- a/plugins/caldav/caldav-browse-server.c
++++ b/plugins/caldav/caldav-browse-server.c
+@@ -891,7 +891,7 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
+ 		return;
+ 
+ 	if (!retrying && !password)
+-		password = e_passwords_get_password ("Calendar", g_object_get_data (dialog, "caldav-auth-key"));
++		password = e_passwords_get_password (NULL, g_object_get_data (dialog, "caldav-auth-key"));
+ 
+ 	if (!password || !*password || retrying) {
+ 		gchar *pass, *prompt, *add = NULL;
+@@ -918,7 +918,7 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
+ 		}
+ 
+ 		pass = e_passwords_ask_password (_("Enter password"),
+-			"Calendar", g_object_get_data (dialog, "caldav-auth-key"), prompt,
++			NULL, g_object_get_data (dialog, "caldav-auth-key"), prompt,
+ 			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_DISABLE_REMEMBER | E_PASSWORDS_SECRET,
+ 			NULL, GTK_WINDOW (dialog));
+ 
+diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
+index 1e54362..5643c4f 100644
+--- a/plugins/google-account-setup/google-source.c
++++ b/plugins/google-account-setup/google-source.c
+@@ -441,7 +441,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
+ 
+ 	user = decode_at_back (username);
+ 	tmp = g_strdup_printf (_("Enter password for user %s to access list of subscribed calendars."), user);
+-	password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp,
++	password = e_passwords_ask_password (_("Enter password"), NULL, "", tmp,
+ 			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_REPROMPT | E_PASSWORDS_SECRET | E_PASSWORDS_DISABLE_REMEMBER,
+ 			NULL, parent);
+ 	g_free (tmp);
+diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
+index 3ea3747..8fad76f 100644
+--- a/plugins/publish-calendar/publish-calendar.c
++++ b/plugins/publish-calendar/publish-calendar.c
+@@ -322,14 +322,14 @@ ask_password (GMountOperation *op, const gchar *message, const gchar *default_us
+ 
+ 	euri = e_uri_new (ms->uri->location);
+ 	username = euri->user;
+-	password = e_passwords_get_password ("Calendar", ms->uri->location);
++	password = e_passwords_get_password (NULL, ms->uri->location);
+ 	req_pass = ((username && *username) && !(ms->uri->service_type == TYPE_ANON_FTP &&
+ 			!strcmp (username, "anonymous"))) ? TRUE:FALSE;
+ 
+ 	if (!password && req_pass) {
+ 		gboolean remember = FALSE;
+ 
+-		password = e_passwords_ask_password (_("Enter password"), "", ms->uri->location, message,
++		password = e_passwords_ask_password (_("Enter password"), NULL, ms->uri->location, message,
+ 					     E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE,
+ 					     &remember,
+ 					     NULL);
+diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
+index af539dd..9089561 100644
+--- a/plugins/publish-calendar/publish-location.c
++++ b/plugins/publish-calendar/publish-location.c
+@@ -88,11 +88,11 @@ migrateURI (const gchar *xml, xmlDocPtr doc)
+ 		uri->publish_frequency = atoi ((gchar *) frequency);
+ 	uri->publish_format = URI_PUBLISH_AS_FB;
+ 
+-	password = e_passwords_get_password ("Calendar", (gchar *)location);
++	password = e_passwords_get_password (NULL, (gchar *)location);
+ 	if (password) {
+-		e_passwords_forget_password ("Calendar", (gchar *)location);
++		e_passwords_forget_password (NULL, (gchar *)location);
+ 		e_passwords_add_password (uri->location, password);
+-		e_passwords_remember_password ("Calendar", uri->location);
++		e_passwords_remember_password (NULL, uri->location);
+ 	}
+ 
+ 	for (p = root->children; p != NULL; p = p->next) {
+diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
+index 26d0a98..c2e68b9 100644
+--- a/plugins/publish-calendar/url-editor-dialog.c
++++ b/plugins/publish-calendar/url-editor-dialog.c
+@@ -437,7 +437,7 @@ url_editor_dialog_construct (UrlEditorDialog *dialog)
+ 		gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->publish_frequency), uri->publish_frequency);
+ 		gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->type_selector), uri->publish_format);
+ 
+-		uri->password = e_passwords_get_password ("Calendar", uri->location);
++		uri->password = e_passwords_get_password (NULL, uri->location);
+ 		if (uri->password) {
+ 			if (strlen (uri->password) != 0) {
+ 				gtk_entry_set_text (GTK_ENTRY (dialog->password_entry), uri->password);
+@@ -572,9 +572,9 @@ url_editor_dialog_run (UrlEditorDialog *dialog)
+ 
+ 		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->remember_pw))) {
+ 			e_passwords_add_password (dialog->uri->location, dialog->uri->password);
+-			e_passwords_remember_password ("Calendar", dialog->uri->location);
++			e_passwords_remember_password (NULL, dialog->uri->location);
+ 		} else {
+-			e_passwords_forget_password ("Calendar", dialog->uri->location);
++			e_passwords_forget_password (NULL, dialog->uri->location);
+ 		}
+ 
+ 		l = e_source_selector_get_selection (E_SOURCE_SELECTOR (dialog->events_selector));
+diff --git a/smime/gui/component.c b/smime/gui/component.c
+index 0b7a679..fbd6d75 100644
+--- a/smime/gui/component.c
++++ b/smime/gui/component.c
+@@ -46,7 +46,7 @@ smime_pk11_passwd (ECertDB *db, PK11SlotInfo* slot, gboolean retry, gchar **pass
+ 	prompt = g_strdup_printf (_("Enter the password for '%s'"), slot_name);
+ 	g_free (slot_name);
+ 
+-	*passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", "",
++	*passwd = e_passwords_ask_password (_("Enter password"), NULL, "",
+ 					    prompt,
+ 					    E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
+ 					    NULL);
+@@ -68,7 +68,7 @@ smime_pk11_change_passwd (ECertDB *db, gchar **old_passwd, gchar **passwd, gpoin
+ 		/* we're setting the password initially */
+ 		prompt = _("Enter new password for certificate database");
+ 
+-		*passwd = e_passwords_ask_password (_("Enter new password"), "SMIME-PKCS11", "",
++		*passwd = e_passwords_ask_password (_("Enter new password"), NULL, "",
+ 						    prompt,
+ 						    E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
+ 						    NULL);
+diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
+index ed7e6a6..f4fa995 100644
+--- a/smime/lib/e-pkcs12.c
++++ b/smime/lib/e-pkcs12.c
+@@ -201,7 +201,7 @@ prompt_for_password (gchar *title, gchar *prompt, SECItem *pwd)
+ {
+ 	gchar *passwd;
+ 
+-	passwd = e_passwords_ask_password (title, "SMIME-PKCS12", "", prompt,
++	passwd = e_passwords_ask_password (title, NULL, "", prompt,
+ 					   E_PASSWORDS_REMEMBER_NEVER|E_PASSWORDS_SECRET, NULL,
+ 					   NULL);
+ 
+--
+cgit v0.9

=== added file 'debian/patches/99git_drop_camel_stream_reset_17127fb.patch'
--- debian/patches/99git_drop_camel_stream_reset_17127fb.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99git_drop_camel_stream_reset_17127fb.patch	2011-07-11 20:53:51 +0000
@@ -0,0 +1,162 @@
+From 17127fbee9fd1b0baecb4e305c005d6abbf8d880 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <[e-mail]>
+Date: Tue, 05 Jul 2011 12:16:13 +0000
+Subject: Prefer g_seekable_seek() over camel_stream_reset().
+
+When a stream is obviously a file or memory stream (both of which
+implement the GSeekable interface), use g_seekable_seek() instead of
+camel_stream_reset().
+
+This is helping me discover if it's safe to remove camel_stream_reset().
+We want to eventually move to GIO streams, which have no reset method.
+---
+diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
+index a8f1bf3..a5a8d0d 100644
+--- a/em-format/em-format-quote.c
++++ b/em-format/em-format-quote.c
+@@ -94,8 +94,11 @@ emfq_format_clone (EMFormat *emf,
+ 	EM_FORMAT_CLASS (parent_class)->format_clone (
+ 		emf, folder, uid, msg, src, cancellable);
+ 
++	g_seekable_seek (
++		G_SEEKABLE (emfq->priv->stream),
++		0, G_SEEK_SET, NULL, NULL);
++
+ 	gconf = gconf_client_get_default ();
+-	camel_stream_reset (emfq->priv->stream, NULL);
+ 	if (gconf_client_get_bool (
+ 		gconf, "/apps/evolution/mail/composer/top_signature", NULL))
+ 		camel_stream_printf (emfq->priv->stream, "<br>\n");
+@@ -257,6 +260,9 @@ em_format_quote_new (const gchar *credits,
+ 
+ 	g_return_val_if_fail (CAMEL_IS_STREAM (stream), NULL);
+ 
++	/* Steam must also be seekable so we can reset its position. */
++	g_return_val_if_fail (G_IS_SEEKABLE (stream), NULL);
++
+ 	emfq = g_object_new (EM_TYPE_FORMAT_QUOTE, NULL);
+ 
+ 	emfq->priv->credits = g_strdup (credits);
+diff --git a/em-format/em-format.c b/em-format/em-format.c
+index 1f9634d..1c2624f 100644
+--- a/em-format/em-format.c
++++ b/em-format/em-format.c
+@@ -1422,7 +1422,8 @@ em_format_format_text (EMFormat *emf,
+ 		(CamelStream *) filter_stream, cancellable, NULL);
+ 	camel_stream_flush ((CamelStream *) filter_stream, cancellable, NULL);
+ 	g_object_unref (filter_stream);
+-	camel_stream_reset (mem_stream, NULL);
++
++	g_seekable_seek (G_SEEKABLE (mem_stream), 0, G_SEEK_SET, NULL, NULL);
+ 
+ 	if (max == -1 || size == -1 || size < (max * 1024) || emf->composer) {
+ 		camel_stream_write_to_stream (
+diff --git a/em-format/em-inline-filter.c b/em-format/em-inline-filter.c
+index c7a8014..1f96395 100644
+--- a/em-format/em-inline-filter.c
++++ b/em-format/em-inline-filter.c
+@@ -121,7 +121,7 @@ inline_filter_add_part (EMInlineFilter *emif, const gchar *data, gint len)
+ 	}
+ 
+ 	emif->data = g_byte_array_new ();
+-	camel_stream_reset (mem, NULL);
++	g_seekable_seek (G_SEEKABLE (mem), 0, G_SEEK_SET, NULL, NULL);
+ 
+ 	dw = camel_data_wrapper_new ();
+ 	if (encoding == emif->base_encoding && (encoding == CAMEL_TRANSFER_ENCODING_BASE64 || encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE)) {
+diff --git a/mail/e-mail-folder-utils.c b/mail/e-mail-folder-utils.c
+index f255c73..64bdbdb 100644
+--- a/mail/e-mail-folder-utils.c
++++ b/mail/e-mail-folder-utils.c
+@@ -1159,9 +1159,7 @@ e_mail_folder_save_messages_sync (CamelFolder *folder,
+ {
+ 	GFileOutputStream *file_output_stream;
+ 	GByteArray *byte_array;
+-	CamelMimeFilter *filter;
+ 	CamelStream *base_stream;
+-	CamelStream *stream;
+ 	gboolean success = TRUE;
+ 	guint ii;
+ 
+@@ -1192,15 +1190,12 @@ e_mail_folder_save_messages_sync (CamelFolder *folder,
+ 
+ 	/* CamelStreamMem takes ownership of the GByteArray. */
+ 	byte_array = g_byte_array_new ();
+-	filter = camel_mime_filter_from_new ();
+ 	base_stream = camel_stream_mem_new_with_byte_array (byte_array);
+-	stream = camel_stream_filter_new (base_stream);
+-	camel_stream_filter_add (CAMEL_STREAM_FILTER (stream), filter);
+-	g_object_unref (base_stream);
+-	g_object_unref (filter);
+ 
+ 	for (ii = 0; ii < message_uids->len; ii++) {
+ 		CamelMimeMessage *message;
++		CamelMimeFilter *filter;
++		CamelStream *stream;
+ 		const gchar *uid;
+ 		gchar *from_line;
+ 		gint percent;
+@@ -1232,10 +1227,17 @@ e_mail_folder_save_messages_sync (CamelFolder *folder,
+ 			goto exit;
+ 		}
+ 
++		filter = camel_mime_filter_from_new ();
++		stream = camel_stream_filter_new (base_stream);
++		camel_stream_filter_add (CAMEL_STREAM_FILTER (stream), filter);
++
+ 		retval = camel_data_wrapper_write_to_stream_sync (
+ 			CAMEL_DATA_WRAPPER (message),
+ 			stream, cancellable, error);
+ 
++		g_object_unref (filter);
++		g_object_unref (stream);
++
+ 		if (retval == -1) {
+ 			g_object_unref (message);
+ 			goto exit;
+@@ -1258,14 +1260,16 @@ e_mail_folder_save_messages_sync (CamelFolder *folder,
+ 
+ 		/* Flush the buffer for the next message.
+ 		 * For memory streams this never fails. */
+-		camel_stream_reset (stream, NULL);
++		g_seekable_seek (
++			G_SEEKABLE (base_stream),
++			0, G_SEEK_SET, NULL, NULL);
+ 
+ 		g_object_unref (message);
+ 	}
+ 
+ exit:
+ 	g_object_unref (file_output_stream);
+-	g_object_unref (stream);
++	g_object_unref (base_stream);
+ 
+ 	camel_operation_pop_message (cancellable);
+ 
+diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
+index 2dcc687..c3b5465 100644
+--- a/mail/em-composer-utils.c
++++ b/mail/em-composer-utils.c
+@@ -1153,7 +1153,6 @@ traverse_parts (GSList *clues, CamelMimeMessage *message, CamelDataWrapper *cont
+ 
+ 		if (replace_variables (clues, message, &str)) {
+ 			stream = camel_stream_mem_new_with_buffer (str, strlen (str));
+-			camel_stream_reset (stream, NULL);
+ 			camel_data_wrapper_construct_from_stream_sync (
+ 				content, stream, NULL, NULL);
+ 			g_object_unref (stream);
+diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
+index e65e687..e6493f2 100644
+--- a/modules/mail/e-mail-attachment-handler.c
++++ b/modules/mail/e-mail-attachment-handler.c
+@@ -221,7 +221,7 @@ mail_attachment_handler_message_rfc822 (EAttachmentView *view,
+ 
+ 	stream = camel_stream_mem_new ();
+ 	camel_stream_write (stream, data, length, NULL, NULL);
+-	camel_stream_reset (stream, NULL);
++	g_seekable_seek (G_SEEKABLE (stream), 0, G_SEEK_SET, NULL, NULL);
+ 
+ 	message = camel_mime_message_new ();
+ 	wrapper = CAMEL_DATA_WRAPPER (message);
+--
+cgit v0.9

=== added file 'debian/patches/99git_ealertbar_underalloc_985ad2d.patch'
--- debian/patches/99git_ealertbar_underalloc_985ad2d.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99git_ealertbar_underalloc_985ad2d.patch	2011-07-11 20:53:51 +0000
@@ -0,0 +1,180 @@
+From 985ad2d4a4f10954329f8b8ab645e3c7d2ceea0a Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <[e-mail]>
+Date: Wed, 06 Jul 2011 23:46:14 +0000
+Subject: EShellContent: Fix underallocation of EAlertBar.
+
+Keeps GTK+ from going crazy with runtime warnings.
+---
+diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
+index 51ca37e..8868163 100644
+--- a/shell/e-shell-content.c
++++ b/shell/e-shell-content.c
+@@ -48,6 +48,10 @@
+ #include "e-shell-view.h"
+ #include "e-shell-window-actions.h"
+ 
++#define E_SHELL_CONTENT_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), E_TYPE_SHELL_CONTENT, EShellContentPrivate))
++
+ struct _EShellContentPrivate {
+ 
+ 	gpointer shell_view;	/* weak pointer */
+@@ -150,7 +154,7 @@ shell_content_dispose (GObject *object)
+ {
+ 	EShellContentPrivate *priv;
+ 
+-	priv = E_SHELL_CONTENT (object)->priv;
++	priv = E_SHELL_CONTENT_GET_PRIVATE (object);
+ 
+ 	if (priv->shell_view != NULL) {
+ 		g_object_remove_weak_pointer (
+@@ -172,7 +176,7 @@ shell_content_finalize (GObject *object)
+ {
+ 	EShellContentPrivate *priv;
+ 
+-	priv = E_SHELL_CONTENT (object)->priv;
++	priv = E_SHELL_CONTENT_GET_PRIVATE (object);
+ 
+ 	g_free (priv->user_filename);
+ 
+@@ -218,27 +222,36 @@ shell_content_get_preferred_width (GtkWidget *widget,
+                                    gint *natural)
+ {
+ 	EShellContentPrivate *priv;
+-	gint min, nat;
+-	gint child_min, child_nat;
+ 	GtkWidget *child;
+ 
+-	priv = E_SHELL_CONTENT (widget)->priv;
++	priv = E_SHELL_CONTENT_GET_PRIVATE (widget);
+ 
+ 	*minimum = *natural = 0;
+ 
+ 	child = gtk_bin_get_child (GTK_BIN (widget));
+-	gtk_widget_get_preferred_width (child, &child_min, &child_nat);
+-	gtk_widget_get_preferred_width (priv->alert_bar, &min, &nat);
++	gtk_widget_get_preferred_width (child, minimum, natural);
+ 
+-	*minimum = MAX (min, child_min);
+-	*natural = MAX (nat, child_nat);
++	if (gtk_widget_get_visible (priv->alert_bar)) {
++		gint child_minimum;
++		gint child_natural;
+ 
+-	if (priv->searchbar == NULL)
+-		return;
++		gtk_widget_get_preferred_width (
++			priv->alert_bar, &child_minimum, &child_natural);
++
++		*minimum = MAX (*minimum, child_minimum);
++		*natural = MAX (*natural, child_natural);
++	}
+ 
+-	gtk_widget_get_preferred_width (priv->searchbar, &min, &nat);
+-	*minimum = MAX (*minimum, min);
+-	*natural = MAX (*natural, nat);
++	if (priv->searchbar != NULL) {
++		gint child_minimum;
++		gint child_natural;
++
++		gtk_widget_get_preferred_width (
++			priv->searchbar, &child_minimum, &child_natural);
++
++		*minimum = MAX (*minimum, child_minimum);
++		*natural = MAX (*natural, child_natural);
++	}
+ }
+ 
+ static void
+@@ -247,20 +260,34 @@ shell_content_get_preferred_height (GtkWidget *widget,
+                                     gint *natural)
+ {
+ 	EShellContentPrivate *priv;
+-	gint min, nat;
+ 	GtkWidget *child;
+ 
+-	priv = E_SHELL_CONTENT (widget)->priv;
++	priv = E_SHELL_CONTENT_GET_PRIVATE (widget);
+ 
+ 	child = gtk_bin_get_child (GTK_BIN (widget));
+ 	gtk_widget_get_preferred_height (child, minimum, natural);
+ 
+-	if (priv->searchbar == NULL)
+-		return;
++	if (gtk_widget_get_visible (priv->alert_bar)) {
++		gint child_minimum;
++		gint child_natural;
+ 
+-	gtk_widget_get_preferred_height (priv->searchbar, &min, &nat);
+-	*minimum += min;
+-	*natural += nat;
++		gtk_widget_get_preferred_height (
++			priv->alert_bar, &child_minimum, &child_natural);
++
++		*minimum += child_minimum;
++		*natural += child_natural;
++	}
++
++	if (priv->searchbar != NULL) {
++		gint child_minimum;
++		gint child_natural;
++
++		gtk_widget_get_preferred_height (
++			priv->searchbar, &child_minimum, &child_natural);
++
++		*minimum += child_minimum;
++		*natural += child_natural;
++	}
+ }
+ 
+ static void
+@@ -273,7 +300,7 @@ shell_content_size_allocate (GtkWidget *widget,
+ 	GtkWidget *child;
+ 	gint remaining_height;
+ 
+-	priv = E_SHELL_CONTENT (widget)->priv;
++	priv = E_SHELL_CONTENT_GET_PRIVATE (widget);
+ 
+ 	remaining_height = allocation->height;
+ 	gtk_widget_set_allocation (widget, allocation);
+@@ -297,7 +324,8 @@ shell_content_size_allocate (GtkWidget *widget,
+ 	remaining_height -= child_requisition.height;
+ 	child_allocation.height = child_requisition.height;
+ 
+-	gtk_widget_size_allocate (child, &child_allocation);
++	if (child_allocation.height > 0)
++		gtk_widget_size_allocate (child, &child_allocation);
+ 
+ 	/* Search bar gets to be as tall as it wants (if we have one). */
+ 
+@@ -332,7 +360,7 @@ shell_content_remove (GtkContainer *container,
+ 	GtkContainerClass *container_class;
+ 	EShellContentPrivate *priv;
+ 
+-	priv = E_SHELL_CONTENT (container)->priv;
++	priv = E_SHELL_CONTENT_GET_PRIVATE (container);
+ 
+ 	if (widget == priv->alert_bar) {
+ 		gtk_widget_unparent (priv->alert_bar);
+@@ -359,7 +387,7 @@ shell_content_forall (GtkContainer *container,
+ {
+ 	EShellContentPrivate *priv;
+ 
+-	priv = E_SHELL_CONTENT (container)->priv;
++	priv = E_SHELL_CONTENT_GET_PRIVATE (container);
+ 
+ 	if (priv->alert_bar != NULL)
+ 		callback (priv->alert_bar, callback_data);
+@@ -470,8 +498,7 @@ e_shell_content_alert_sink_init (EAlertSinkInterface *interface)
+ static void
+ e_shell_content_init (EShellContent *shell_content)
+ {
+-	shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+-		shell_content, E_TYPE_SHELL_CONTENT, EShellContentPrivate);
++	shell_content->priv = E_SHELL_CONTENT_GET_PRIVATE (shell_content);
+ 
+ 	gtk_widget_set_has_window (GTK_WIDGET (shell_content), FALSE);
+ }
+--
+cgit v0.9

=== added file 'debian/patches/99git_emformatquote_cleanups_a51ea9b.patch'
--- debian/patches/99git_emformatquote_cleanups_a51ea9b.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/99git_emformatquote_cleanups_a51ea9b.patch	2011-07-11 20:53:51 +0000
@@ -0,0 +1,224 @@
+From a51ea9b9770660531d1d48da4c230e0af118f297 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <[e-mail]>
+Date: Tue, 05 Jul 2011 13:12:41 +0000
+Subject: EMFormatQuote cleanups.
+
+Move public members to the private struct.
+---
+diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
+index f0a005f..a8f1bf3 100644
+--- a/em-format/em-format-quote.c
++++ b/em-format/em-format-quote.c
+@@ -34,8 +34,15 @@
+ #include "em-stripsig-filter.h"
+ #include "em-format-quote.h"
+ 
++#define EM_FORMAT_QUOTE_GET_PRIVATE(obj) \
++	(G_TYPE_INSTANCE_GET_PRIVATE \
++	((obj), EM_TYPE_FORMAT_QUOTE, EMFormatQuotePrivate))
++
+ struct _EMFormatQuotePrivate {
+-	gint dummy;
++	gchar *credits;
++	CamelStream *stream;
++	EMFormatQuoteFlags flags;
++	guint32 text_html_flags;
+ };
+ 
+ static void emfq_builtin_init (EMFormatQuoteClass *efhc);
+@@ -43,13 +50,29 @@ static void emfq_builtin_init (EMFormatQuoteClass *efhc);
+ static gpointer parent_class;
+ 
+ static void
++emfq_dispose (GObject *object)
++{
++	EMFormatQuotePrivate *priv;
++
++	priv = EM_FORMAT_QUOTE_GET_PRIVATE (object);
++
++	if (priv->stream != NULL) {
++		g_object_unref (priv->stream);
++		priv->stream = NULL;
++	}
++
++	/* Chain up to parent's dispose() method. */
++	G_OBJECT_CLASS (parent_class)->dispose (object);
++}
++
++static void
+ emfq_finalize (GObject *object)
+ {
+-	EMFormatQuote *emfq =(EMFormatQuote *) object;
++	EMFormatQuotePrivate *priv;
+ 
+-	if (emfq->stream)
+-		g_object_unref (emfq->stream);
+-	g_free (emfq->credits);
++	priv = EM_FORMAT_QUOTE_GET_PRIVATE (object);
++
++	g_free (priv->credits);
+ 
+ 	/* Chain up to parent's finalize() method. */
+ 	G_OBJECT_CLASS (parent_class)->finalize (object);
+@@ -72,25 +95,25 @@ emfq_format_clone (EMFormat *emf,
+ 		emf, folder, uid, msg, src, cancellable);
+ 
+ 	gconf = gconf_client_get_default ();
+-	camel_stream_reset (emfq->stream, NULL);
++	camel_stream_reset (emfq->priv->stream, NULL);
+ 	if (gconf_client_get_bool (
+ 		gconf, "/apps/evolution/mail/composer/top_signature", NULL))
+-		camel_stream_printf (emfq->stream, "<br>\n");
++		camel_stream_printf (emfq->priv->stream, "<br>\n");
+ 	g_object_unref (gconf);
+ 	handle = em_format_find_handler(emf, "x-evolution/message/prefix");
+ 	if (handle)
+ 		handle->handler (
+-			emf, emfq->stream,
++			emf, emfq->priv->stream,
+ 			CAMEL_MIME_PART (msg),
+ 			handle, cancellable, FALSE);
+ 	handle = em_format_find_handler(emf, "x-evolution/message/rfc822");
+ 	if (handle)
+ 		handle->handler (
+-			emf, emfq->stream,
++			emf, emfq->priv->stream,
+ 			CAMEL_MIME_PART (msg),
+ 			handle, cancellable, FALSE);
+ 
+-	camel_stream_flush (emfq->stream, cancellable, NULL);
++	camel_stream_flush (emfq->priv->stream, cancellable, NULL);
+ 
+ 	g_signal_emit_by_name(emf, "complete");
+ }
+@@ -149,7 +172,7 @@ emfq_format_attachment (EMFormat *emf,
+ 	/* output some info about it */
+ 	text = em_format_describe_part (part, mime_type);
+ 	html = camel_text_to_html (
+-		text, emfq->text_html_flags &
++		text, emfq->priv->text_html_flags &
+ 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
+ 	camel_stream_write_string (stream, html, cancellable, NULL);
+ 	g_free (html);
+@@ -177,6 +200,7 @@ emfq_class_init (EMFormatQuoteClass *class)
+ 	g_type_class_add_private (class, sizeof (EMFormatQuotePrivate));
+ 
+ 	object_class = G_OBJECT_CLASS (class);
++	object_class->dispose = emfq_dispose;
+ 	object_class->finalize = emfq_finalize;
+ 
+ 	format_class = EM_FORMAT_CLASS (class);
+@@ -189,8 +213,10 @@ emfq_class_init (EMFormatQuoteClass *class)
+ static void
+ emfq_init (EMFormatQuote *emfq)
+ {
++	emfq->priv = EM_FORMAT_QUOTE_GET_PRIVATE (emfq);
++
+ 	/* we want to convert url's etc */
+-	emfq->text_html_flags =
++	emfq->priv->text_html_flags =
+ 		CAMEL_MIME_FILTER_TOHTML_PRE |
+ 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
+ 		CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
+@@ -233,9 +259,9 @@ em_format_quote_new (const gchar *credits,
+ 
+ 	emfq = g_object_new (EM_TYPE_FORMAT_QUOTE, NULL);
+ 
+-	emfq->credits = g_strdup (credits);
+-	emfq->stream = g_object_ref (stream);
+-	emfq->flags = flags;
++	emfq->priv->credits = g_strdup (credits);
++	emfq->priv->stream = g_object_ref (stream);
++	emfq->priv->flags = flags;
+ 
+ 	return emfq;
+ }
+@@ -494,8 +520,9 @@ emfq_format_message_prefix (EMFormat *emf,
+ {
+ 	EMFormatQuote *emfq = (EMFormatQuote *) emf;
+ 
+-	if (emfq->credits)
+-		camel_stream_printf(stream, "%s<br>\n", emfq->credits);
++	if (emfq->priv->credits != NULL)
++		camel_stream_printf (
++			stream, "%s<br>\n", emfq->priv->credits);
+ }
+ 
+ static void
+@@ -508,7 +535,7 @@ emfq_format_message (EMFormat *emf,
+ {
+ 	EMFormatQuote *emfq = (EMFormatQuote *) emf;
+ 
+-	if (emfq->flags & EM_FORMAT_QUOTE_CITE)
++	if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE)
+ 		camel_stream_printf (
+ 			stream, "<!--+GtkHTML:<DATA class=\"ClueFlow\" "
+ 			"key=\"orig\" value=\"1\">-->\n"
+@@ -519,12 +546,12 @@ emfq_format_message (EMFormat *emf,
+ 			stream,  "%s</br>\n",
+ 			_("-------- Forwarded Message --------"));
+ 		emfq_format_headers (emfq, stream, (CamelMedium *) part);
+-	} else if (emfq->flags & EM_FORMAT_QUOTE_HEADERS)
++	} else if (emfq->priv->flags & EM_FORMAT_QUOTE_HEADERS)
+ 		emfq_format_headers (emfq, stream, (CamelMedium *) part);
+ 
+ 	em_format_part (emf, stream, part, cancellable);
+ 
+-	if (emfq->flags & EM_FORMAT_QUOTE_CITE)
++	if (emfq->priv->flags & EM_FORMAT_QUOTE_CITE)
+ 		camel_stream_write_string (
+ 			stream, "</blockquote><!--+GtkHTML:"
+ 			"<DATA class=\"ClueFlow\" clear=\"orig\">-->",
+@@ -612,7 +639,7 @@ emfq_text_plain (EMFormat *emf,
+ 		g_object_unref (mp);
+ 	}
+ 
+-	flags = emfq->text_html_flags;
++	flags = emfq->priv->text_html_flags;
+ 
+ 	/* Check for RFC 2646 flowed text. */
+ 	type = camel_mime_part_get_content_type (part);
+@@ -623,7 +650,7 @@ emfq_text_plain (EMFormat *emf,
+ 
+ 	filtered_stream = camel_stream_filter_new (stream);
+ 
+-	if ((emfq->flags & EM_FORMAT_QUOTE_KEEP_SIG) == 0) {
++	if ((emfq->priv->flags & EM_FORMAT_QUOTE_KEEP_SIG) == 0) {
+ 		sig_strip = em_stripsig_filter_new (TRUE);
+ 		camel_stream_filter_add (
+ 			CAMEL_STREAM_FILTER (filtered_stream), sig_strip);
+@@ -687,10 +714,14 @@ emfq_text_html (EMFormat *emf,
+                 GCancellable *cancellable,
+                 gboolean is_fallback)
+ {
++	EMFormatQuotePrivate *priv;
++
++	priv = EM_FORMAT_QUOTE_GET_PRIVATE (emf);
++
+ 	camel_stream_write_string (
+ 		stream, "\n<!-- text/html -->\n", cancellable, NULL);
+ 
+-	if ((EM_FORMAT_QUOTE (emf)->flags & EM_FORMAT_QUOTE_KEEP_SIG) == 0) {
++	if ((priv->flags & EM_FORMAT_QUOTE_KEEP_SIG) == 0) {
+ 		CamelMimeFilter *sig_strip;
+ 		CamelStream *filtered_stream;
+ 
+diff --git a/em-format/em-format-quote.h b/em-format/em-format-quote.h
+index c956153..5c1882e 100644
+--- a/em-format/em-format-quote.h
++++ b/em-format/em-format-quote.h
+@@ -59,12 +59,6 @@ typedef enum {
+ struct _EMFormatQuote {
+ 	EMFormat format;
+ 	EMFormatQuotePrivate *priv;
+-
+-	gchar *credits;
+-	CamelStream *stream;
+-	EMFormatQuoteFlags flags;
+-
+-	guint32 text_html_flags;
+ };
+ 
+ struct _EMFormatQuoteClass {
+--
+cgit v0.9

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-05-19 16:14:33 +0000
+++ debian/patches/series	2011-07-11 20:53:51 +0000
@@ -11,3 +11,8 @@
 91_add_u1_email_translations.patch
 93_no_tray_icon_by_default.patch
 99-remove-gettext-macros.patch
+99git_camelsession_e-passwords_99d492b.patch
+99git_emformatquote_cleanups_a51ea9b.patch
+99git_drop_camel_stream_reset_17127fb.patch
+99git_avoid_camel_stream_printf_005a26d.patch
+99git_ealertbar_underalloc_985ad2d.patch

=== modified file 'debian/rules'
--- debian/rules	2011-06-28 15:54:12 +0000
+++ debian/rules	2011-07-11 20:53:51 +0000
@@ -37,6 +37,7 @@
         --disable-contacts-map \
 	--disable-image-inline \
 	--disable-scrollkeeper \
+	--disable-goa \
 	--enable-python \
 	--with-sub-version=-$(DEB_REVISION)