Merge lp:~purejava/pantheon-mail/fix-1546062 into lp:~elementary-apps/pantheon-mail/trunk

[Ralph Plawetzki]

Workaround to display inline images that have a Content-Id ending with '.'

=== modified file 'src/client/conversation-viewer/conversation-viewer.vala'
--- src/client/conversation-viewer/conversation-viewer.vala	2016-02-24 11:48:02 +0000
+++ src/client/conversation-viewer/conversation-viewer.vala	2016-02-29 19:21:27 +0000
@@ -2027,7 +2027,17 @@
                     img.set_attribute("class", DATA_IMAGE_CLASS);
                     if (!Geary.String.is_empty(filename))
                         img.set_attribute("alt", filename);
-                    img.set_attribute("replaced-id", replaced_images_index.get(content_id));
+                    
+                    // FIXME: bugzilla.gnome.org 762782
+                    // in case content_id has a trailing period it gets removed
+                    // this is necessary as g_mime_object_get_content_id removes it too
+                    if (content_id.has_suffix(".")) {
+                        string content_id_without_suffix;
+                        content_id_without_suffix = content_id.slice(0,content_id.length-1);
+                        img.set_attribute("replaced-id", replaced_images_index.get(content_id_without_suffix));
+                    } else {
+                        img.set_attribute("replaced-id", replaced_images_index.get(content_id));
+                    }
                     
                     // stash here so inlined image isn't listed as attachment (esp. if it has no
                     // Content-Disposition)
 
=== modified file 'src/engine/rfc822/rfc822-message.vala'
--- src/engine/rfc822/rfc822-message.vala	2016-02-16 16:37:14 +0000
+++ src/engine/rfc822/rfc822-message.vala	2016-02-29 19:21:27 +0000
@@ -714,7 +714,13 @@
         return part.get_filename();
     }
     
-    private GMime.Part? find_mime_part_by_mime_id(GMime.Object root, string mime_id) {
+    private GMime.Part? find_mime_part_by_mime_id(GMime.Object root, owned string mime_id) {
+        // FIXME: bugzilla.gnome.org 762782
+        // in case mime_id has a trailing period it gets removed
+        // this is necessary as g_mime_object_get_content_id removes it too
+        if (mime_id.has_suffix("."))
+            mime_id =  mime_id.slice(0,mime_id.length-1);
+        
         // If this is a multipart container, check each of its children.
         if (root is GMime.Multipart) {
             GMime.Multipart multipart = root as GMime.Multipart;