diff options
author | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
---|---|---|
committer | Tomas Popela <tpopela@redhat.com> | 2014-06-09 22:32:25 +0800 |
commit | 8650fb139a9143f04615de74ff569bce3e0c4ce3 (patch) | |
tree | 89a41d08f179a5359b8eaee0c9344b8a5bf07cb3 /modules/mail/e-mail-shell-backend.c | |
parent | 04b7c97275ae420dca43f3e65c2ef54d02f01bdd (diff) | |
download | gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.gz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.bz2 gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.lz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.xz gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.tar.zst gsoc2013-evolution-8650fb139a9143f04615de74ff569bce3e0c4ce3.zip |
Bug 540362: [webkit-composer] Use webkit for composer
Merge wip/webkit-composer branch into master.
Diffstat (limited to 'modules/mail/e-mail-shell-backend.c')
-rw-r--r-- | modules/mail/e-mail-shell-backend.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index e74086f204..321e1032e3 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -475,21 +475,26 @@ mail_shell_backend_window_added_cb (GtkApplication *application, EShell *shell = E_SHELL (application); EMailBackend *backend; EMailSession *session; + EHTMLEditor *editor = NULL; const gchar *backend_name; backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); + if (E_IS_MSG_COMPOSER (window)) + editor = e_msg_composer_get_editor (E_MSG_COMPOSER (window)); + + if (E_IS_MAIL_SIGNATURE_EDITOR (window)) + editor = e_mail_signature_editor_get_editor ( + E_MAIL_SIGNATURE_EDITOR (window)); + /* This applies to both the composer and signature editor. */ - if (GTKHTML_IS_EDITOR (window)) { + if (editor != NULL) { + EHTMLEditorView *view; GSettings *settings; - GList *spell_languages; gboolean active = TRUE; - spell_languages = e_load_spell_languages (); - gtkhtml_editor_set_spell_languages ( - GTKHTML_EDITOR (window), spell_languages); - g_list_free (spell_languages); + view = e_html_editor_get_view (editor); settings = g_settings_new ("org.gnome.evolution.mail"); @@ -498,7 +503,7 @@ mail_shell_backend_window_added_cb (GtkApplication *application, g_object_unref (settings); - gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); + e_html_editor_view_set_html_mode (view, active); } if (E_IS_MSG_COMPOSER (window)) { |