From e3966e7034c7e11da5616968f30d5194aa6fc5c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Tue, 19 Jun 2012 10:22:14 +0200
Subject: Bug #678345 - Runtime warning when sender photo is disabled

---
 em-format/e-mail-parser-headers.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'em-format')

diff --git a/em-format/e-mail-parser-headers.c b/em-format/e-mail-parser-headers.c
index 0a2c2bd40e..76b846464d 100644
--- a/em-format/e-mail-parser-headers.c
+++ b/em-format/e-mail-parser-headers.c
@@ -70,6 +70,10 @@ empe_headers_bind_dom (EMailPart *part,
 	document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (element));
 	photo = webkit_dom_document_get_element_by_id (document, "__evo-contact-photo");
 
+	/* Contact photos disabled, the <img> tag is not there */
+	if (!photo)
+		return;
+
 	addr = webkit_dom_element_get_attribute (photo, "data-mailaddr");
 	only_local = webkit_dom_element_has_attribute (photo, "data-onlylocal");
 
-- 
cgit v1.2.3