[evolution/wip/webkit2] Subscribe to load-changed signal instead of load-status

[Tomas Popela <tpopela src gnome org>]

commit 269476175c0641609c1e14ce33051fa9035fbfbe
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Sep 16 15:32:25 2014 +0200

    Subscribe to load-changed signal instead of load-status

 composer/e-composer-private.c |   23 +++++++++--------------
 e-util/e-html-editor-view.c   |   23 +++++++++++------------
 mail/e-mail-reader.c          |   10 +++++-----
 3 files changed, 25 insertions(+), 31 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 69d6db4..1a33425 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -1218,22 +1218,18 @@ exit:
 }
 
 static void
-composer_web_view_load_status_changed_cb (WebKitWebView *webkit_web_view,
-                                         GParamSpec *pspec,
-                                         EMsgComposer *composer)
+composer_web_view_load_changed_cb (WebKitWebView *webkit_web_view,
+                                   WebKitLoadEvent load_event,
+                                   EMsgComposer *composer)
 {
-       WebKitLoadStatus status;
-
        g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
-       status = webkit_web_view_get_load_status (webkit_web_view);
-
-       if (status != WEBKIT_LOAD_FINISHED)
+       if (load_event != WEBKIT_LOAD_FINISHED)
                return;
 
        g_signal_handlers_disconnect_by_func (
                webkit_web_view,
-               G_CALLBACK (composer_web_view_load_status_changed_cb),
+               G_CALLBACK (composer_web_view_load_changed_cb),
                NULL);
 
        e_composer_update_signature (composer);
@@ -1260,17 +1256,16 @@ e_composer_update_signature (EMsgComposer *composer)
        editor = e_msg_composer_get_editor (composer);
        view = e_html_editor_get_view (editor);
 
-       status = webkit_web_view_get_load_status (WEBKIT_WEB_VIEW (view));
        /* If document is not loaded, we will wait for him */
-       if (status != WEBKIT_LOAD_FINISHED) {
+       if (webkit_web_view_is_loading (WEBKIT_WEB_VIEW (view))) {
                /* Disconnect previous handlers */
                g_signal_handlers_disconnect_by_func (
                        WEBKIT_WEB_VIEW (view),
-                       G_CALLBACK (composer_web_view_load_status_changed_cb),
+                       G_CALLBACK (composer_web_view_load_changed_cb),
                        composer);
                g_signal_connect (
-                       WEBKIT_WEB_VIEW(view), "notify::load-status",
-                       G_CALLBACK (composer_web_view_load_status_changed_cb),
+                       WEBKIT_WEB_VIEW(view), "load-changed",
+                       G_CALLBACK (composer_web_view_load_changed_cb),
                        composer);
                return;
        }
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 892b570..49fa96e 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -1179,14 +1179,13 @@ register_input_event_listener_on_body (EHTMLEditorView *view)
 }
 
 static void
-html_editor_view_load_status_changed (EHTMLEditorView *view)
+html_editor_view_load_changed (EHTMLEditorView *view,
+                               WebKitLoadEvent load_event)
 {
        WebKitDOMDocument *document;
        WebKitDOMHTMLElement *body;
-       WebKitLoadStatus status;
 
-       status = webkit_web_view_get_load_status (WEBKIT_WEB_VIEW (view));
-       if (status != WEBKIT_LOAD_FINISHED)
+       if (load_event != WEBKIT_LOAD_FINISHED)
                return;
 
        view->priv->reload_in_progress = FALSE;
@@ -4722,13 +4721,13 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
 }
 
 static void
-html_plain_text_convertor_load_status_changed (WebKitWebView *web_view,
-                                               GParamSpec *pspec,
-                                               EHTMLEditorView *view)
+html_plain_text_convertor_load_changed (WebKitWebView *web_view,
+                                        WebKitLoadEvent event,
+                                        EHTMLEditorView *view)
 {
        WebKitDOMDocument *document_convertor;
 
-       if (webkit_web_view_get_load_status (web_view) != WEBKIT_LOAD_FINISHED)
+       if (load_event != WEBKIT_LOAD_FINISHED)
                return;
 
        document_convertor = webkit_web_view_get_dom_document (web_view);
@@ -4817,8 +4816,8 @@ e_html_editor_view_init (EHTMLEditorView *view)
                view, "resource-request-starting",
                G_CALLBACK (html_editor_view_resource_requested), NULL);
        g_signal_connect (
-               view, "notify::load-status",
-               G_CALLBACK (html_editor_view_load_status_changed), NULL);
+               view, "load-changed",
+               G_CALLBACK (html_editor_view_load_changed), NULL);
 
        view->priv->selection = g_object_new (
                E_TYPE_HTML_EDITOR_SELECTION,
@@ -4882,8 +4881,8 @@ e_html_editor_view_init (EHTMLEditorView *view)
                NULL);
 
        g_signal_connect (
-               view->priv->convertor_web_view, "notify::load-status",
-               G_CALLBACK (html_plain_text_convertor_load_status_changed), view);
+               view->priv->convertor_web_view, "load-changed",
+               G_CALLBACK (html_plain_text_convertor_load_changed), view);
 
        /* Make WebKit think we are displaying a local file, so that it
         * does not block loading resources from file:// protocol */
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index cf474a7..f18e8da 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2659,12 +2659,12 @@ schedule_timeout_mark_seen (EMailReader *reader)
 
 static void
 mail_reader_load_status_changed_cb (EMailReader *reader,
-                                    GParamSpec *pspec,
+                                    WebKitLoadEvent event,
                                     EMailDisplay *display)
 {
        EMailReaderPrivate *priv;
 
-       if (webkit_web_view_get_load_status (WEBKIT_WEB_VIEW (display)) != WEBKIT_LOAD_FINISHED)
+       if (event != WEBKIT_LOAD_FINISHED)
                return;
 
        priv = E_MAIL_READER_GET_PRIVATE (reader);
@@ -4017,9 +4017,9 @@ connect_signals:
                display, "key-press-event",
                G_CALLBACK (mail_reader_key_press_event_cb), reader);
 
-       e_signal_connect_notify_swapped (
-               display, "notify::load-status",
-               G_CALLBACK (mail_reader_load_status_changed_cb), reader);
+       e_signal_connect_swapped (
+               display, "load-changed",
+               G_CALLBACK (mail_reader_load_changed_cb), reader);
 
        g_signal_connect_swapped (
                message_list, "message-selected",