aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-callbacks.c11
2 files changed, 15 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a2a3d09a88..9740c6ad04 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-12 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * mail-callbacks.c (forward_message): Attach a signature when
+ forwarding, fixes bug #826.
+
2000-12-11 Dan Winship <danw@helixcode.com>
* session.c (mail_session_enable_interaction): New function to
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index deaabb00ac..5307eb976f 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -484,7 +484,10 @@ forward_message (FolderBrowser *fb, gboolean attach)
{
EMsgComposer *composer;
CamelMimeMessage *cursor_msg;
+ MailConfigIdentity *id;
GPtrArray *uids;
+ gchar *sig_file = NULL;
+ gboolean send_html;
cursor_msg = fb->mail_display->current_message;
g_return_if_fail (cursor_msg != NULL);
@@ -492,7 +495,13 @@ forward_message (FolderBrowser *fb, gboolean attach)
if (!check_send_configuration (fb))
return;
- composer = e_msg_composer_new ();
+ id = mail_config_get_default_identity ();
+ send_html = mail_config_send_html ();
+
+ if (id)
+ sig_file = id->sig;
+
+ composer = e_msg_composer_new_with_sig_file (sig_file, send_html);
if (!composer)
return;