From: Jose Dapena Paz <jdapena@igalia.com>
Date: Mon, 30 Nov 2009 13:02:01 +0000 (+0100)
Subject: Detect better the CID's of images in msg view.
X-Git-Tag: 3.2.4~3
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=879777b916963b7b083fe80f9fa5347747543c7d

Detect better the CID's of images in msg view.
---

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index d7f5238..eff6f93 100644
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -1593,6 +1593,7 @@ request_fetch_images (ModestGtkhtmlMsgView *self)
 	/* The message could have not been downloaded yet */
 	if (priv->msg) {
 		modest_mime_part_view_set_view_images (MODEST_MIME_PART_VIEW (priv->body_view), TRUE);
+		priv->has_blocked_bs_images = FALSE;
 		part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->body_view));
 		if (part) {
 			tny_mime_part_view_set_part (TNY_MIME_PART_VIEW (priv->body_view), part);
@@ -1684,6 +1685,14 @@ find_cid_image (TnyMsg *msg, const gchar *cid)
 		if (part_cid && strcmp (cid, part_cid) == 0)
 			break;
 
+		if (part_cid && part_cid[0] == '<') {
+			const gchar *end;
+			end = g_strrstr_len (part_cid, -1, ">");
+
+			if (end && strncmp (part_cid + 1, cid, end - part_cid - 1) == 0)
+				break;
+		}
+
 		if (tny_mime_part_content_type_is (part, "multipart/related")) {
 			TnyList *related_parts = TNY_LIST (tny_simple_list_new ());
 			TnyIterator *related_iter = NULL;