diff options
Diffstat (limited to 'mail/em-composer-prefs.c')
-rw-r--r-- | mail/em-composer-prefs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index dc7b3b9c4c..41975589ef 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -168,8 +168,11 @@ sig_load_preview (EMComposerPrefs *prefs, else str = e_msg_composer_get_sig_file_content ( signature->filename, signature->html); - if (!str) - str = g_strdup (""); + if (!str || !*str) { + /* make html stream happy and write at least one character */ + g_free (str); + str = g_strdup (" "); + } if (signature->html) { gtk_html_load_from_string (html, str, strlen (str)); @@ -1045,7 +1048,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) prefs->sig_add = GTK_BUTTON (widget); widget = glade_xml_get_widget (gui, "cmdSignatureAddScript"); - gtk_widget_set_sensitive (widget, sensitive); + gtk_widget_set_sensitive (widget, sensitive && !mail_config_scripts_disabled ()); g_signal_connect ( widget, "clicked", G_CALLBACK (sig_add_script_cb), prefs); |