aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadek Doulik <rodo@ximian.com>2002-06-08 02:09:10 +0800
committerRadek Doulik <rodo@src.gnome.org>2002-06-08 02:09:10 +0800
commitb84f0a894bcdd5487fc678d1ea036945508278ad (patch)
treee04b73e8eb7045c345489eb9e3880dc3473637ba
parent88bf7aaa37eed28bbc8229c49d08a966e1cf0d67 (diff)
downloadgsoc2013-evolution-b84f0a894bcdd5487fc678d1ea036945508278ad.tar
gsoc2013-evolution-b84f0a894bcdd5487fc678d1ea036945508278ad.tar.gz
gsoc2013-evolution-b84f0a894bcdd5487fc678d1ea036945508278ad.tar.bz2
gsoc2013-evolution-b84f0a894bcdd5487fc678d1ea036945508278ad.tar.lz
gsoc2013-evolution-b84f0a894bcdd5487fc678d1ea036945508278ad.tar.xz
gsoc2013-evolution-b84f0a894bcdd5487fc678d1ea036945508278ad.tar.zst
gsoc2013-evolution-b84f0a894bcdd5487fc678d1ea036945508278ad.zip
use new script signature interface
2002-06-07 Radek Doulik <rodo@ximian.com> * e-msg-composer.c (get_signature_html): use new script signature interface svn path=/trunk/; revision=17143
-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); */