[evolution/wip/webkit-composer: 254/372] Bug #689804 - [webkit-composer] Signature not auto-added

[Tomas Popela <tpopela src gnome org>]

commit 4ed39db09a0d1733788cca53cebf0a7029551251
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Apr 23 10:51:53 2013 +0200

    Bug #689804 - [webkit-composer] Signature not auto-added
    
    We have to wait until the email body is loaded in WebKit.

 composer/e-composer-private.c |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index d4840f0..5b0d841 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -925,10 +925,24 @@ exit:
        g_object_unref (composer);
 }
 
-static gboolean
-is_null_or_none (const gchar *text)
+static void
+composer_web_view_load_status_changed_cb (WebKitWebView *webkit_web_view,
+                                         GParamSpec *pspec,
+                                         EMsgComposer *composer)
 {
-       return !text || g_strcmp0 (text, "none") == 0;
+       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)
+               return;
+
+       g_signal_handlers_disconnect_by_func (
+               webkit_web_view, G_CALLBACK (composer_web_view_load_status_changed_cb), NULL);
+
+       e_composer_update_signature (composer);
 }
 
 void
@@ -936,7 +950,9 @@ e_composer_update_signature (EMsgComposer *composer)
 {
        EComposerHeaderTable *table;
        EMailSignatureComboBox *combo_box;
-       const gchar *signature_uid;
+       EEditor *editor;
+       EEditorWidget *editor_widget;
+       WebKitLoadStatus status;
 
        g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
@@ -959,6 +975,17 @@ e_composer_update_signature (EMsgComposer *composer)
        composer->priv->selected_signature_uid = g_strdup (signature_uid);
 
        combo_box = e_composer_header_table_get_signature_combo_box (table);
+       editor = e_msg_composer_get_editor (composer);
+       editor_widget = e_editor_get_editor_widget (editor);
+
+       status = webkit_web_view_get_load_status (WEBKIT_WEB_VIEW (editor_widget));
+       /* If document is not loaded, we will wait for him */
+       if (status != WEBKIT_LOAD_FINISHED) {
+               g_signal_connect (
+                       WEBKIT_WEB_VIEW(editor_widget), "notify::load-status",
+                       G_CALLBACK (composer_web_view_load_status_changed_cb), composer);
+               return;
+       }
 
        /* XXX Signature files should be local and therefore load quickly,
         *     so while we do load them asynchronously we don't allow for