[evolution-data-server] CamelIMAPXStream: Close the source stream on close().



commit 16611d9a15158f21de7988f5c0104ad8fba97ae3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Aug 29 11:21:26 2012 -0400

    CamelIMAPXStream: Close the source stream on close().

 camel/camel-imapx-server.c |    6 ++----
 camel/camel-imapx-stream.c |    5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index 9dcdff7..2149409 100644
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -6073,12 +6073,10 @@ imapx_disconnect (CamelIMAPXServer *is)
 	g_static_rec_mutex_lock (&is->ostream_lock);
 
 	if (is->stream) {
-		CamelStream *source;
+		CamelStream *stream = CAMEL_STREAM (is->stream);
 
-		source = camel_imapx_stream_ref_source (is->stream);
-		if (camel_stream_close (source, NULL, NULL) == -1)
+		if (camel_stream_close (stream, NULL, NULL) == -1)
 			ret = FALSE;
-		g_object_unref (source);
 
 		g_object_unref (is->stream);
 		is->stream = NULL;
diff --git a/camel/camel-imapx-stream.c b/camel/camel-imapx-stream.c
index 7b69219..2e80571 100644
--- a/camel/camel-imapx-stream.c
+++ b/camel/camel-imapx-stream.c
@@ -239,8 +239,9 @@ imapx_stream_close (CamelStream *stream,
                     GCancellable *cancellable,
                     GError **error)
 {
-	/* nop? */
-	return 0;
+	CamelIMAPXStream *is = (CamelIMAPXStream *) stream;
+
+	return camel_stream_close (is->priv->source, cancellable, error);
 }
 
 static gint



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]