From c37da1342398fdc4836baa89d0506a0950a10bb6 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 3 Jan 2001 11:52:04 +0000 Subject: Call mail-callbacks.c:forward_messages(), so the behaviour is the same as 2001-01-03 Not Zed * mail-view.c (view_forward_msg): Call mail-callbacks.c:forward_messages(), so the behaviour is the same as from the folder browser. * mail-callbacks.c (forward_messages): New function to forward messages, attached or not. (forward_inlined): Changed to use new forward-messages implementation. (forward_attached): Likewise. (do_forward_attach): Callback for forwarding as attachment, once we have built it. (do_forward_inline): Likewise, for inline, once we have retrieved the message. (forward_message): Removed. * mail-ops.c (mail_build_attachment): New function to build an attachment of messages. (mail_do_attach_message): Removed, functionality superceeded by above. (mail_do_forward_message): Removed. Likewise. (mail_create_folder): Started work on an alternative implementation of create_folder, but not sure about it yet. * mail-tools.c (mail_tool_generate_forward_subject): Remove locking. (mail_tool_make_message_attachment): Free the description when done. svn path=/trunk/; revision=7232 --- mail/mail-tools.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'mail/mail-tools.c') diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 5bfefa758b..a564818b3c 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -370,10 +370,6 @@ mail_tool_generate_forward_subject (CamelMimeMessage *msg) char *fwd_subj, *fromstr; const CamelInternetAddress *from; - /* we need to lock around the whole function, as we are - only getting references to the message's data */ - mail_tool_camel_lock_up(); - from = camel_mime_message_get_from(msg); subject = camel_mime_message_get_subject(msg); @@ -395,8 +391,6 @@ mail_tool_generate_forward_subject (CamelMimeMessage *msg) fwd_subj = g_strdup (_("Fwd: (no subject)")); } - mail_tool_camel_lock_down(); - return fwd_subj; } @@ -440,6 +434,7 @@ mail_tool_make_message_attachment (CamelMimeMessage *message) camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (message)); camel_mime_part_set_content_type (part, "message/rfc822"); + g_free(desc); /*camel_object_unref (CAMEL_OBJECT (message));*/ return part; } -- cgit v1.2.3