diff options
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 4d22d92c2f..f8449abc57 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,5 +1,10 @@ 2004-04-01 Jeffrey Stedfast <fejj@ximian.com> + * e-msg-composer.c (get_signature_html): Fixed some breakage I + introduced in the changes below. + +2004-04-01 Jeffrey Stedfast <fejj@ximian.com> + * e-msg-composer.c: Updated to use the new signature APIs. (signature_added): _()ify the "Autogenerated" signature name. diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index b3516396c3..d5ba46b8d6 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1009,16 +1009,21 @@ static char * get_signature_html (EMsgComposer *composer) { char *text = NULL, *html = NULL; - gboolean format_html = FALSE; + gboolean format_html; + + if (!composer->signature) + return NULL; if (!composer->signature->autogen) { if (!composer->signature->filename) return NULL; + format_html = composer->signature->html; + if (composer->signature->script) { text = mail_config_signature_run_script (composer->signature->filename); } else { - text = e_msg_composer_get_sig_file_content (composer->signature->filename, composer->signature->html); + text = e_msg_composer_get_sig_file_content (composer->signature->filename, format_html); } } else { EAccountIdentity *id; |