From 8db3da39d77c5c360e4bfe29cf652e333e737374 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 3 May 2012 16:19:58 -0400 Subject: Revert "Bug #669463 - HTML signature opens in editor as Plain text" This reverts commit f25826211b007a615118f9b583a66d7027eddeac. Not an issue on the account-mgmt branch. We can do without this hack. --- modules/mail/e-mail-shell-backend.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'modules/mail') diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 2633b72e4e..43a4cf5789 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -40,7 +40,6 @@ #include #include -#include #include #include @@ -364,6 +363,7 @@ 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; @@ -372,19 +372,14 @@ mail_shell_backend_window_added_cb (GtkApplication *application, GTKHTML_EDITOR (window), spell_languages); g_list_free (spell_languages); - if (!E_IS_SIGNATURE_EDITOR (window) || - !e_signature_editor_get_editing_old (E_SIGNATURE_EDITOR (window))) { - EShellSettings *shell_settings; + shell_settings = e_shell_get_shell_settings (shell); - shell_settings = e_shell_get_shell_settings (shell); + /* 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"); - /* 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); - } + gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); } if (E_IS_MSG_COMPOSER (window)) { -- cgit v1.2.3