[evolution/wip/webkit2] Adapt code changes from bug 769072



commit 85fdc0e798bc81ef0d28d949c87d96214cc99ca1
Author: Milan Crha <mcrha redhat com>
Date:   Wed Aug 10 15:45:40 2016 +0200

    Adapt code changes from bug 769072

 composer/e-msg-composer.c |    6 +++---
 mail/em-composer-utils.c  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index ce453a8..732ec2f 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -4074,15 +4074,15 @@ msg_composer_save_to_drafts_done_cb (gpointer user_data,
 {
        EMsgComposer *composer = user_data;
        EHTMLEditor *editor;
-       EHTMLEditorView *view;
+       EContentEditor *cnt_editor;
 
        g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 
        editor = e_msg_composer_get_editor (composer);
-       view = e_html_editor_get_view (editor);
+       cnt_editor = e_html_editor_get_content_editor (editor);
 
        if (e_msg_composer_is_exiting (composer) &&
-           !e_html_editor_view_get_changed (view)) {
+           !e_content_editor_get_changed (cnt_editor)) {
                gtk_widget_destroy (GTK_WIDGET (composer));
        } else if (e_msg_composer_is_exiting (composer)) {
                gtk_widget_set_sensitive (GTK_WIDGET (composer), TRUE);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index b025f4e..2a68541 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -944,7 +944,7 @@ composer_save_to_drafts_cleanup (GObject *source_object,
                                GTK_WINDOW (async_context->composer),
                                "mail:ask-default-drafts", local_error->message, NULL);
                        if (response != GTK_RESPONSE_YES) {
-                               e_html_editor_view_set_changed (view, TRUE);
+                               e_content_editor_set_changed (cnt_editor, TRUE);
                                async_context_free (async_context);
                        } else {
                                composer_save_to_drafts_append_mail (async_context, NULL);


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