[evolution/webkit: 9/123] Fix default property value in EMFormatHTML

[Dan VrÃtil <dvratil src gnome org>]

commit 33d25d20b8074f58da22b604ae6f279807d2170c
Author: Dan VrÃtil <dvratil redhat com>
Date:   Wed Jul 27 18:22:36 2011 +0200

    Fix default property value in EMFormatHTML
    
    The correct default value of sender_photo is FALSE, otherwise the
    feature could not be turned off.
    Also fixes a possible crash when formatting is cancelled and proper
    initialization of headers_collapsable property.

 mail/em-format-html.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index afd6dd9..1213281 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -919,7 +919,7 @@ efh_class_init (EMFormatHTMLClass *class)
 			"show-sender-photo",
 			"Show Sender Photo",
 			NULL,
-			TRUE,
+			FALSE,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT));
 
@@ -968,7 +968,7 @@ efh_class_init (EMFormatHTMLClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_HEADERS_STATE,
+		PROP_HEADERS_COLLAPSABLE,
 		g_param_spec_boolean (
 			"headers-collapsable",
 			NULL,
@@ -2002,6 +2002,8 @@ efh_text_plain (EMFormat *emf,
 	flags = efh->text_html_flags;
 
 	dw = camel_medium_get_content ((CamelMedium *) part);
+	if (!dw)
+		return;
 
 	/* Check for RFC 2646 flowed text. */
 	if (camel_content_type_is(dw->mime_type, "text", "plain")