[evolution/wip/webkit2] Inline images are not renewed when reopening draft



commit 7369a10a6c79bab1dbf702f86de7db1fca81e17e
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Jul 12 15:44:02 2016 +0200

    Inline images are not renewed when reopening draft

 modules/webkit-editor/e-webkit-editor.c            |    2 +-
 .../web-extension/e-editor-dom-functions.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/modules/webkit-editor/e-webkit-editor.c b/modules/webkit-editor/e-webkit-editor.c
index 50abf15..6c8ab2d 100644
--- a/modules/webkit-editor/e-webkit-editor.c
+++ b/modules/webkit-editor/e-webkit-editor.c
@@ -1775,7 +1775,7 @@ webkit_editor_insert_image_from_mime_part (EContentEditor *editor,
        g_dbus_proxy_call (
                wk_editor->priv->web_extension,
                "DOMAddNewInlineImageIntoList",
-               g_variant_new ("(tss)", current_page_id (wk_editor), name, cid_uri, src),
+               g_variant_new ("(tsss)", current_page_id (wk_editor), name, cid_uri, src),
                G_DBUS_CALL_FLAGS_NONE,
                -1,
                NULL,
diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c 
b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
index 4fa29ca..27eaaf2 100644
--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -8510,7 +8510,6 @@ change_cid_images_src_to_base64 (EEditorPage *editor_page)
                g_object_unref (node);
        }
        g_object_unref (list);
-       g_hash_table_remove_all (inline_images);
 }
 
 static void
@@ -8614,6 +8613,7 @@ e_editor_dom_process_content_after_load (EEditorPage *editor_page)
        e_editor_dom_register_input_event_listener_on_body (editor_page);
        register_html_events_handlers (editor_page, body);
 
+       e_editor_dom_fix_file_uri_images (editor_page);
        change_cid_images_src_to_base64 (editor_page);
 
        if (e_editor_page_get_inline_spelling_enabled (editor_page))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]