aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/mail-format.c9
-rw-r--r--mail/message-list.c1
3 files changed, 15 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0aa6639bb9..c8f2ec558f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2000-05-07 Dan Winship <danw@helixcode.com>
+
+ * message-list.c (select_msg): unref the message after displaying
+ it.
+
+ * mail-format.c (get_data_wrapper_text):
+ (handle_text_plain_flowed):
+ (handle_via_bonobo): Replace camel_stream_close calls.
+
2000-05-07 Matt Loper <matt@helixcode.com>
* folder-browser-factory.c: Changed a toolbar button from saying
diff --git a/mail/mail-format.c b/mail/mail-format.c
index 0fb9ddaa17..12026a5ce7 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -423,7 +423,7 @@ get_data_wrapper_text (CamelDataWrapper *data)
memcpy (text, ba->data, ba->len);
text[ba->len] = '\0';
- camel_stream_close (memstream);
+ gtk_object_unref (GTK_OBJECT (memstream));
return text;
}
@@ -534,7 +534,7 @@ handle_text_plain_flowed (CamelMimePart *part, CamelMimeMessage *root,
g_free (line);
} while (!camel_stream_eos (buffer));
- camel_stream_close (buffer);
+ gtk_object_unref (GTK_OBJECT (buffer));
mail_html_write (html, stream, "</tt>\n");
mail_html_end (html, stream, TRUE, box);
@@ -1061,7 +1061,7 @@ handle_via_bonobo (CamelMimePart *part, CamelMimeMessage *root, GtkBox *box)
/* ...convert the CamelStreamMem to a BonoboStreamMem... */
bstream = bonobo_stream_mem_create (ba->data, ba->len, TRUE, FALSE);
- camel_stream_close (cstream);
+ gtk_object_unref (GTK_OBJECT (cstream));
/* ...and hydrate the PersistStream from the BonoboStream. */
CORBA_exception_init (&ev);
@@ -1351,7 +1351,8 @@ mail_generate_forward (CamelMimeMessage *mime_message,
stream = camel_stream_fs_new_with_fd (fd);
camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (mime_message),
stream);
- camel_stream_close (stream);
+ camel_stream_flush (stream);
+ gtk_object_unref (GTK_OBJECT (stream));
composer = E_MSG_COMPOSER (e_msg_composer_new ());
e_msg_composer_attachment_bar_attach (E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar), tmpfile);
diff --git a/mail/message-list.c b/mail/message-list.c
index b577650f11..e0aa14fcef 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -112,6 +112,7 @@ select_msg (MessageList *message_list, gint row)
gtk_signal_connect((GtkObject *)message, "message_changed", message_changed, message_list);
mail_display_set_message (message_list->parent_folder_browser->mail_display,
CAMEL_MEDIUM (message));
+ gtk_object_unref (GTK_OBJECT (message));
}
}