From f25826211b007a615118f9b583a66d7027eddeac Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 3 May 2012 14:43:32 +0200 Subject: Bug #669463 - HTML signature opens in editor as Plain text --- modules/mail/e-mail-shell-backend.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'modules') diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index f30d8e387d..10392198f0 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -38,6 +38,7 @@ #include #include +#include #include #include @@ -361,7 +362,6 @@ mail_shell_backend_window_added_cb (GtkApplication *application, /* This applies to both the composer and signature editor. */ if (GTKHTML_IS_EDITOR (window)) { - EShellSettings *shell_settings; GList *spell_languages; gboolean active = TRUE; @@ -370,14 +370,19 @@ mail_shell_backend_window_added_cb (GtkApplication *application, GTKHTML_EDITOR (window), spell_languages); g_list_free (spell_languages); - shell_settings = e_shell_get_shell_settings (shell); + if (!E_IS_SIGNATURE_EDITOR (window) || + !e_signature_editor_get_editing_old (E_SIGNATURE_EDITOR (window))) { + EShellSettings *shell_settings; - /* Express mode does not honor this setting. */ - if (!e_shell_get_express_mode (shell)) - active = e_shell_settings_get_boolean ( - shell_settings, "composer-format-html"); + shell_settings = e_shell_get_shell_settings (shell); - gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); + /* Express mode does not honor this setting. */ + if (!e_shell_get_express_mode (shell)) + active = e_shell_settings_get_boolean ( + shell_settings, "composer-format-html"); + + gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); + } } if (E_IS_MSG_COMPOSER (window)) { -- cgit v1.2.3