From 6269637d7226d702fd05c4cdb6160adab0e18718 Mon Sep 17 00:00:00 2001 From: Jason Leach Date: Sun, 21 Jan 2001 21:08:38 +0000 Subject: (Fix #1222: doing File->New->Mail Message doesn't include .sig) 2001-01-20 Jason Leach (Fix #1222: doing File->New->Mail Message doesn't include .sig) * evolution-composer.c (init): Get the users account information, see if they've specified a sig file, if they do, create a composer with that sig. svn path=/trunk/; revision=7686 --- composer/ChangeLog | 8 ++++++++ composer/evolution-composer.c | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/composer/ChangeLog b/composer/ChangeLog index e2a42efc6a..cb5778ce3c 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,11 @@ +2001-01-20 Jason Leach + + (Fix #1222: doing File->New->Mail Message doesn't include .sig) + + * evolution-composer.c (init): Get the users account information, + see if they've specified a sig file, if they do, create a composer + with that sig. + 2001-01-19 Jeffrey Stedfast * e-msg-composer-hdrs.c (create_optionmenu): Use "Full Name diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c index 0d8af6eed9..3036f98e82 100644 --- a/composer/evolution-composer.c +++ b/composer/evolution-composer.c @@ -239,7 +239,21 @@ class_init (EvolutionComposerClass *klass) static void init (EvolutionComposer *composer) { - composer->composer = e_msg_composer_new (); + const MailConfigAccount *account; + gboolean send_html; + gchar *sig_file = NULL; + + account = mail_config_get_default_account (); + send_html = mail_config_get_send_html (); + + if (account->id) + sig_file = account->id->signature; + + if (sig_file) + composer->composer = e_msg_composer_new_with_sig_file (sig_file, send_html); + else + composer->composer = e_msg_composer_new (); + gtk_signal_connect (GTK_OBJECT (composer->composer), "send", GTK_SIGNAL_FUNC (send_cb), NULL); gtk_signal_connect (GTK_OBJECT (composer->composer), "postpone", -- cgit v1.2.3