diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-31 23:47:17 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-04-01 00:10:54 +0800 |
commit | 018018fabe7e660f7928b8a7b817bb63202dc734 (patch) | |
tree | 4003e5c682570d819b6baf49528631efb2c52892 /modules/mail/em-composer-prefs.c | |
parent | 85fac8778261ce1fc80d8857158eb18a399da9ee (diff) | |
download | gsoc2013-evolution-018018fabe7e660f7928b8a7b817bb63202dc734.tar gsoc2013-evolution-018018fabe7e660f7928b8a7b817bb63202dc734.tar.gz gsoc2013-evolution-018018fabe7e660f7928b8a7b817bb63202dc734.tar.bz2 gsoc2013-evolution-018018fabe7e660f7928b8a7b817bb63202dc734.tar.lz gsoc2013-evolution-018018fabe7e660f7928b8a7b817bb63202dc734.tar.xz gsoc2013-evolution-018018fabe7e660f7928b8a7b817bb63202dc734.tar.zst gsoc2013-evolution-018018fabe7e660f7928b8a7b817bb63202dc734.zip |
Remove more Express Mode hacks.
This removes all traces of Express Mode from all but the contact editor
and calendar appointment editor. Need to evaluate the remaining cases
individually.
Diffstat (limited to 'modules/mail/em-composer-prefs.c')
-rw-r--r-- | modules/mail/em-composer-prefs.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index a2e1628299..57de8ab8f6 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -317,16 +317,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, /* Default Behavior */ - /* Express mode does not honor this setting. */ widget = e_builder_get_widget (prefs->builder, "chkSendHTML"); - if (e_shell_get_express_mode (shell)) { - gtk_widget_hide (widget); - } else { - g_settings_bind ( - settings, "composer-send-html", - widget, "active", - G_SETTINGS_BIND_DEFAULT); - } + g_settings_bind ( + settings, "composer-send-html", + widget, "active", + G_SETTINGS_BIND_DEFAULT); widget = e_builder_get_widget (prefs->builder, "chkPromptEmptySubject"); g_settings_bind ( @@ -496,12 +491,10 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, widget, "editor-created", G_CALLBACK (gtk_application_add_window), shell); - /* Express mode does not honor this setting. */ - if (!e_shell_get_express_mode (shell)) - g_settings_bind ( - settings, "composer-send-html", - widget, "prefer-html", - G_SETTINGS_BIND_GET); + g_settings_bind ( + settings, "composer-send-html", + widget, "prefer-html", + G_SETTINGS_BIND_GET); /* get our toplevel widget */ target = em_config_target_new_prefs (ec); |