diff options
Diffstat (limited to 'camel/providers')
| -rw-r--r-- | camel/providers/mbox/camel-mbox-folder.c | 4 | ||||
| -rw-r--r-- | camel/providers/nntp/camel-nntp-folder.c | 2 | ||||
| -rw-r--r-- | camel/providers/nntp/camel-nntp-store.c | 5 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-folder.c | 1 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 17 | ||||
| -rw-r--r-- | camel/providers/sendmail/camel-sendmail-transport.c | 3 | ||||
| -rw-r--r-- | camel/providers/smtp/camel-smtp-transport.c | 5 |
7 files changed, 14 insertions, 23 deletions
diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c index bc1913cb0d..a0a593a00f 100644 --- a/camel/providers/mbox/camel-mbox-folder.c +++ b/camel/providers/mbox/camel-mbox-folder.c @@ -804,11 +804,11 @@ mbox_append_message (CamelFolder *folder, CamelMimeMessage *message, CamelExcept camel_stream_write_string (output_stream, "From - \n"); /* FIXME: does this return an error? IT HAS TO FOR THIS TO BE RELIABLE */ camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), output_stream); - camel_stream_close (output_stream); /* TODO: update the summary so it knows a new message is there to summarise/index */ /* This is only a performance improvement, the summary is *only* a cache */ + camel_stream_flush (output_stream); gtk_object_unref (GTK_OBJECT (output_stream)); } @@ -901,8 +901,6 @@ mbox_get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException * message_stream = camel_stream_fs_new_with_name_and_bounds (mbox_folder->folder_file_path, O_RDONLY, 0, ((CamelMboxMessageContentInfo *)info->info.content)->pos, ((CamelMboxMessageContentInfo *)info->info.content)->endpos); - gtk_object_ref((GtkObject *)message_stream); - gtk_object_sink((GtkObject *)message_stream); message = camel_mime_message_new(); if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)message, message_stream) == -1) { gtk_object_unref((GtkObject *)message); diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c index 0c4ba1691d..6fee4d2aac 100644 --- a/camel/providers/nntp/camel-nntp-folder.c +++ b/camel/providers/nntp/camel-nntp-folder.c @@ -469,7 +469,7 @@ _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException camel_stream_write_string (output_stream, "From - \n"); camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), output_stream); } - camel_stream_close (output_stream); + camel_stream_flush (output_stream); gtk_object_unref (GTK_OBJECT (output_stream)); /* at this point we have saved the message to a diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c index c1a721d96c..639e8fa9e0 100644 --- a/camel/providers/nntp/camel-nntp-store.c +++ b/camel/providers/nntp/camel-nntp-store.c @@ -232,11 +232,8 @@ nntp_disconnect (CamelService *service, CamelException *ex) if (!service_class->disconnect (service, ex)) return FALSE; - /* Closing the buffered write stream will close the - * unbuffered read stream wrapped inside it as well. - */ - camel_stream_close (store->ostream); gtk_object_unref (GTK_OBJECT (store->ostream)); + gtk_object_unref (GTK_OBJECT (store->istream)); store->ostream = NULL; store->istream = NULL; return TRUE; diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c index f47851a6a4..bb2c7de6e1 100644 --- a/camel/providers/pop3/camel-pop3-folder.c +++ b/camel/providers/pop3/camel-pop3-folder.c @@ -209,6 +209,7 @@ get_message_by_number (CamelFolder *folder, gint number, CamelException *ex) msg = camel_mime_message_new (); camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), msgstream); + gtk_object_unref (GTK_OBJECT (msgstream)); return msg; } diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index ff4ca265a1..9ae87ad420 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -382,8 +382,8 @@ pop3_connect (CamelService *service, CamelException *ex) "Could not read greeting from POP " "server."); return FALSE; - camel_stream_close (store->ostream); - camel_stream_close (store->istream); + gtk_object_unref (GTK_OBJECT (store->ostream)); + gtk_object_unref (GTK_OBJECT (store->istream)); } apoptime = strchr (buf, '<'); apopend = apoptime ? strchr (apoptime, '>') : NULL; @@ -418,8 +418,8 @@ pop3_connect (CamelService *service, CamelException *ex) "server. Error sending username:" " %s", msg ? msg : "(Unknown)"); g_free (msg); - camel_stream_close (store->ostream); - camel_stream_close (store->istream); + gtk_object_unref (GTK_OBJECT (store->ostream)); + gtk_object_unref (GTK_OBJECT (store->istream)); return FALSE; } @@ -433,8 +433,8 @@ pop3_connect (CamelService *service, CamelException *ex) "server. Error sending password:" " %s", msg ? msg : "(Unknown)"); g_free (msg); - camel_stream_close (store->ostream); - camel_stream_close (store->istream); + gtk_object_unref (GTK_OBJECT (store->ostream)); + gtk_object_unref (GTK_OBJECT (store->istream)); return FALSE; } @@ -453,11 +453,8 @@ pop3_disconnect (CamelService *service, CamelException *ex) if (!service_class->disconnect (service, ex)) return FALSE; - /* Closing the buffered write stream will close the - * unbuffered read stream wrapped inside it as well. - */ - camel_stream_close (store->ostream); gtk_object_unref (GTK_OBJECT (store->ostream)); + gtk_object_unref (GTK_OBJECT (store->istream)); store->ostream = NULL; store->istream = NULL; return TRUE; diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c index 15ba1f04e1..fad9d9681d 100644 --- a/camel/providers/sendmail/camel-sendmail-transport.c +++ b/camel/providers/sendmail/camel-sendmail-transport.c @@ -140,7 +140,8 @@ _send_internal (CamelMedium *message, char **argv, CamelException *ex) close (fd[0]); out = camel_stream_fs_new_with_fd (fd[1]); camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), out); - camel_stream_close (out); + camel_stream_flush (out); + gtk_object_unref (GTK_OBJECT (out)); /* Wait for sendmail to exit. */ while (waitpid (pid, &wstat, 0) == -1 && errno == EINTR) diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index 992948560e..b32936012a 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -198,11 +198,8 @@ smtp_disconnect (CamelService *service, CamelException *ex) if (!service_class->disconnect (service, ex)) return FALSE; - /* Closing the buffered write stream will close the - * unbuffered read stream wrapped inside it as well. - */ - camel_stream_close (transport->ostream); gtk_object_unref (GTK_OBJECT (transport->ostream)); + gtk_object_unref (GTK_OBJECT (transport->istream)); transport->ostream = NULL; transport->istream = NULL; |