From e36b12c46c4b0ce11222909a3e3062c5b1818d46 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 7 Jul 2003 18:23:47 +0000 Subject: Apply a From-filter when dragging as a test/uri-list and message/rfc822. 2003-07-02 Jeffrey Stedfast * folder-browser.c (message_list_drag_data_get): Apply a From-filter when dragging as a test/uri-list and message/rfc822. Fixes bug #45617. Also free the uids ptrarray for the text/uri-list case. svn path=/trunk/; revision=21749 --- mail/ChangeLog | 8 -------- mail/folder-browser.c | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 29173456fd..4530711902 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,13 +1,5 @@ 2003-07-02 Jeffrey Stedfast - * mail-tools.c (mail_tool_forward_message): Strip the signature - from the body text. Fixes bug #45523. While we're here, also fix - the code to quote exactly the same way as the - mail_tool_quote_message() function. - (mail_tool_quote_message): The last arg should not be - 'want_plain', because that arg is for whether or not the body - should be quoted. - * folder-browser.c (message_list_drag_data_get): Apply a From-filter when dragging as a test/uri-list and message/rfc822. Fixes bug #45617. Also free the uids ptrarray for diff --git a/mail/folder-browser.c b/mail/folder-browser.c index e28ff18431..6ff8c386fd 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -371,11 +371,14 @@ message_list_drag_data_get (ETree *tree, int row, ETreePath path, int col, camel_stream_write (fstream, "From - \n", 8); camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream); camel_object_unref (message); + camel_stream_flush (stream); + for (i = 1; i < uids->len; i++) { message = camel_folder_get_message (fb->folder, uids->pdata[i], NULL); camel_stream_write (fstream, "From - \n", 8); camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream); camel_object_unref (message); + camel_stream_flush (stream); g_free (uids->pdata[i]); } @@ -409,9 +412,10 @@ message_list_drag_data_get (ETree *tree, int row, ETreePath path, int col, g_free (uids->pdata[i]); if (message) { - camel_stream_write (stream, "From - \n", 8); + camel_stream_write (mem, "From - \n", 8); camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream); camel_object_unref (message); + camel_stream_flush (stream); } } -- cgit v1.2.3