diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-06-17 17:51:13 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-06-17 17:51:13 +0800 |
| commit | cef3b32167f0b04f028767eceb3030eea81cabc9 (patch) | |
| tree | de0301721a0f42c713fb330883dc905b28b4a76d /e-util | |
| parent | 5fca7d616970c1d96f35ebe898994f1d470d5a7b (diff) | |
| download | gsoc2013-evolution-cef3b32167f0b04f028767eceb3030eea81cabc9.tar gsoc2013-evolution-cef3b32167f0b04f028767eceb3030eea81cabc9.tar.gz gsoc2013-evolution-cef3b32167f0b04f028767eceb3030eea81cabc9.tar.bz2 gsoc2013-evolution-cef3b32167f0b04f028767eceb3030eea81cabc9.tar.lz gsoc2013-evolution-cef3b32167f0b04f028767eceb3030eea81cabc9.tar.xz gsoc2013-evolution-cef3b32167f0b04f028767eceb3030eea81cabc9.tar.zst gsoc2013-evolution-cef3b32167f0b04f028767eceb3030eea81cabc9.zip | |
Bug 702703 - Be able to overwrite domain in Message IDs
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-html-editor-view.c | 12 | ||||
| -rw-r--r-- | e-util/e-html-editor-view.h | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c index 4fd9f1473e..19184ef1db 100644 --- a/e-util/e-html-editor-view.c +++ b/e-util/e-html-editor-view.c @@ -6042,7 +6042,8 @@ e_html_editor_view_check_magic_links (EHTMLEditorView *view, static CamelMimePart * e_html_editor_view_add_inline_image_from_element (EHTMLEditorView *view, WebKitDOMElement *element, - const gchar *attribute) + const gchar *attribute, + const gchar *uid_domain) { CamelStream *stream; CamelDataWrapper *wrapper; @@ -6092,7 +6093,7 @@ e_html_editor_view_add_inline_image_from_element (EHTMLEditorView *view, camel_medium_set_content (CAMEL_MEDIUM (part), wrapper); g_object_unref (wrapper); - cid = camel_header_msgid_generate (); + cid = camel_header_msgid_generate (uid_domain); camel_mime_part_set_content_id (part, cid); name = webkit_dom_element_get_attribute (element, "data-name"); camel_mime_part_set_filename (part, name); @@ -6107,7 +6108,8 @@ out: } GList * -e_html_editor_view_get_parts_for_inline_images (EHTMLEditorView *view) +e_html_editor_view_get_parts_for_inline_images (EHTMLEditorView *view, + const gchar *uid_domain) { GHashTable *added; GList *parts = NULL; @@ -6131,7 +6133,7 @@ e_html_editor_view_get_parts_for_inline_images (EHTMLEditorView *view) if (!g_hash_table_lookup (added, src)) { part = e_html_editor_view_add_inline_image_from_element ( - view, WEBKIT_DOM_ELEMENT (node), "src"); + view, WEBKIT_DOM_ELEMENT (node), "src", uid_domain); parts = g_list_append (parts, part); g_hash_table_insert ( added, src, (gpointer) camel_mime_part_get_content_id (part)); @@ -6165,7 +6167,7 @@ e_html_editor_view_get_parts_for_inline_images (EHTMLEditorView *view) if (!g_hash_table_lookup (added, src)) { part = e_html_editor_view_add_inline_image_from_element ( - view, WEBKIT_DOM_ELEMENT (node), "background"); + view, WEBKIT_DOM_ELEMENT (node), "background", uid_domain); if (part) { parts = g_list_append (parts, part); g_hash_table_insert ( diff --git a/e-util/e-html-editor-view.h b/e-util/e-html-editor-view.h index e40b15b375..9d5e2d85a0 100644 --- a/e-util/e-html-editor-view.h +++ b/e-util/e-html-editor-view.h @@ -158,7 +158,8 @@ void e_html_editor_view_add_inline_image_from_mime_part (EHTMLEditorView *view, CamelMimePart *part); GList * e_html_editor_view_get_parts_for_inline_images - (EHTMLEditorView *view); + (EHTMLEditorView *view, + const gchar *uid_domain); G_END_DECLS #endif /* E_HTML_EDITOR_VIEW_H */ |