aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c14
2 files changed, 13 insertions, 6 deletions
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 <rodo@ximian.com>
+
+ * e-msg-composer.c (get_signature_html): use new script signature
+ interface
+
2002-06-06 Jeffrey Stedfast <fejj@ximian.com>
* 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); */