diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-30 20:27:49 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-30 21:25:30 +0800 |
| commit | c516014a5afb2338d1b2e6d7b0438a1835bf9fa8 (patch) | |
| tree | 6f426c92f76dd7fedaf9c907f199610e01677dd5 /modules/mail/em-composer-prefs.c | |
| parent | ca79c7993fc6ed146c62d3ce984878350be7c110 (diff) | |
| download | gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.tar.gz gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.tar.zst gsoc2013-evolution-c516014a5afb2338d1b2e6d7b0438a1835bf9fa8.zip | |
Express: Composer always defaults to HTML mode
Composer and signature editor always default to HTML in Express mode.
Hide the corresponding composer preference. This will not affect the
user preference in normal mode.
Diffstat (limited to 'modules/mail/em-composer-prefs.c')
| -rw-r--r-- | modules/mail/em-composer-prefs.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 574657806e..53a9888a47 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -398,10 +398,15 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, /* General tab */ /* Default Behavior */ + + /* Express mode does not honor this setting. */ widget = e_builder_get_widget (prefs->builder, "chkSendHTML"); - e_mutual_binding_new ( - shell_settings, "composer-format-html", - widget, "active"); + if (e_shell_get_express_mode (shell)) + gtk_widget_hide (widget); + else + e_mutual_binding_new ( + shell_settings, "composer-format-html", + widget, "active"); widget = e_builder_get_widget (prefs->builder, "chkPromptEmptySubject"); e_mutual_binding_new ( @@ -517,9 +522,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, widget, "editor-created", G_CALLBACK (e_shell_watch_window), shell); - e_binding_new ( - shell_settings, "composer-format-html", - widget, "prefer-html"); + /* Express mode does not honor this setting. */ + if (!e_shell_get_express_mode (shell)) + e_binding_new ( + shell_settings, "composer-format-html", + widget, "prefer-html"); #ifndef G_OS_WIN32 e_binding_new_with_negation ( |