[evolution/wip/webkit-composer: 770/966] Fix bugs introduced by rebase.

[Tomas Popela <tpopela src gnome org>]

commit 68f582521c0dc7463c72e1ba4ab67561885c22e5
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Jan 16 15:26:38 2014 +0100

    Fix bugs introduced by rebase.

 composer/e-composer-private.c                   |   22 +++-------------------
 composer/e-composer-private.h                   |    2 --
 modules/composer-autosave/e-composer-autosave.c |    2 +-
 3 files changed, 4 insertions(+), 22 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 5536b31..5f3f303 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -406,6 +406,9 @@ e_composer_private_finalize (EMsgComposer *composer)
        g_free (composer->priv->charset);
        g_free (composer->priv->mime_type);
        g_free (composer->priv->mime_body);
+
+       g_hash_table_destroy (composer->priv->inline_images);
+       g_hash_table_destroy (composer->priv->inline_images_by_url);
 }
 
 gchar *
@@ -1217,25 +1220,6 @@ e_composer_update_signature (EMsgComposer *composer)
                        WEBKIT_WEB_VIEW(editor_widget), "notify::load-status",
                        G_CALLBACK (composer_web_view_load_status_changed_cb), composer);
                return;
-
-       g_free (composer->priv->selected_signature_uid);
-       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) {
-               /* Disconnect previous handlers */
-               g_signal_handlers_disconnect_by_func (
-                       WEBKIT_WEB_VIEW (editor_widget),
-                       G_CALLBACK (composer_web_view_load_status_changed_cb), composer);
-               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,
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index c9d554f..528273b 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -93,8 +93,6 @@ struct _EMsgComposerPrivate {
        CamelMimeMessage *redirect;
 
        gboolean is_from_message;
-       gboolean is_from_new_message;
-       gboolean set_signature_from_message;
 };
 
 void           e_composer_private_constructed  (EMsgComposer *composer);
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index 5f24205..6f85550 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -133,7 +133,7 @@ composer_autosave_changed_cb (EComposerAutosave *autosave)
 
        editor = e_msg_composer_get_editor (E_MSG_COMPOSER (extensible));
        editor_widget = e_editor_get_editor_widget (editor);
-       autosave->changed = e_editor_widget_get_changed (editor_widget);
+       autosave->priv->changed = e_editor_widget_get_changed (editor_widget);
 
        if (autosave->priv->changed && autosave->priv->timeout_id == 0) {
                autosave->priv->timeout_id = e_named_timeout_add_seconds (