diff options
author | Federico Mena Quintero <federico@novell.com> | 2010-04-10 04:09:46 +0800 |
---|---|---|
committer | Federico Mena Quintero <federico@novell.com> | 2010-04-10 04:09:46 +0800 |
commit | b360395495a273356355959c1067c00abf18e2d4 (patch) | |
tree | 8316320e8e3c2078fafa9ced6a503197b5e6d6cd /modules/mail | |
parent | 5b5ac7a174676bf665b627b25d25ae9a9de689f4 (diff) | |
parent | a16f08974d6955f843dddce3b9423c5349873488 (diff) | |
download | gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.gz gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.tar.zst gsoc2013-evolution-b360395495a273356355959c1067c00abf18e2d4.zip |
Merge branch 'express2' into express2-reduced-preferences
Diffstat (limited to 'modules/mail')
-rw-r--r-- | modules/mail/em-composer-prefs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 05c4bd30c2..72c5d18b25 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -529,9 +529,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, shell_settings, "composer-format-html", widget, "prefer-html"); +#ifndef G_OS_WIN32 e_binding_new_with_negation ( shell_settings, "disable-command-line", widget, "allow-scripts"); +#endif signature_tree_view = e_signature_manager_get_tree_view ( E_SIGNATURE_MANAGER (widget)); @@ -541,9 +543,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); +#ifndef G_OS_WIN32 e_binding_new_with_negation ( shell_settings, "disable-command-line", widget, "allow-scripts"); +#endif e_binding_new ( signature_tree_view, "selected", |