diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-05-03 20:43:32 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-05-03 20:43:32 +0800 |
| commit | f25826211b007a615118f9b583a66d7027eddeac (patch) | |
| tree | 2060a8fc197fe369dda2dd58f7c88029f4f88b0f /modules/mail | |
| parent | a195cd1e79d3226011935f3d238579cc8009d92d (diff) | |
| download | gsoc2013-evolution-f25826211b007a615118f9b583a66d7027eddeac.tar gsoc2013-evolution-f25826211b007a615118f9b583a66d7027eddeac.tar.gz gsoc2013-evolution-f25826211b007a615118f9b583a66d7027eddeac.tar.bz2 gsoc2013-evolution-f25826211b007a615118f9b583a66d7027eddeac.tar.lz gsoc2013-evolution-f25826211b007a615118f9b583a66d7027eddeac.tar.xz gsoc2013-evolution-f25826211b007a615118f9b583a66d7027eddeac.tar.zst gsoc2013-evolution-f25826211b007a615118f9b583a66d7027eddeac.zip | |
Bug #669463 - HTML signature opens in editor as Plain text
Diffstat (limited to 'modules/mail')
| -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 f30d8e387d..10392198f0 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -38,6 +38,7 @@ #include <composer/e-msg-composer.h> #include <widgets/misc/e-preferences-window.h> +#include <widgets/misc/e-signature-editor.h> #include <widgets/misc/e-web-view.h> #include <libemail-engine/e-mail-folder-utils.h> @@ -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)) { |