From b84f0a894bcdd5487fc678d1ea036945508278ad Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 7 Jun 2002 18:09:10 +0000 Subject: use new script signature interface 2002-06-07 Radek Doulik * e-msg-composer.c (get_signature_html): use new script signature interface svn path=/trunk/; revision=17143 --- composer/ChangeLog | 5 +++++ composer/e-msg-composer.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'composer') diff --git a/composer/ChangeLog b/composer/ChangeLog index fa76e257bb..6f12747c2c 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2002-06-07 Radek Doulik + + * e-msg-composer.c (get_signature_html): use new script signature + interface + 2002-06-06 Jeffrey Stedfast * e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account): diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 129a6249d0..e551271f63 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -879,12 +879,14 @@ get_signature_html (EMsgComposer *composer) } if (!text) { - if (!sig_file) - return NULL; - /* printf ("sig file: %s\n", sig_file); */ - - mail_config_signature_run_script (script); - text = e_msg_composer_get_sig_file_content (sig_file, format_html); + if (script) + text = mail_config_signature_run_script (script); + else { + if (!sig_file) + return NULL; + /* printf ("sig file: %s\n", sig_file); */ + text = e_msg_composer_get_sig_file_content (sig_file, format_html); + } } /* printf ("text: %s\n", text); */ -- cgit