[evolution-mapi] Prefer g_seekable_seek() over camel_stream_reset().



commit 3bf09092bfbcbf745d48afb75bc5761c24b8d809
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jul 5 08:09:15 2011 -0400

    Prefer g_seekable_seek() over camel_stream_reset().
    
    When a stream is obviously a file or memory stream (both of which
    implement the GSeekable interface), use g_seekable_seek() instead of
    camel_stream_reset().
    
    This is helping me discover if it's safe to remove camel_stream_reset().
    We want to eventually move to GIO streams, which have no reset method.

 src/camel/camel-mapi-folder.c                  |    7 ++++---
 src/libexchangemapi/exchange-mapi-mail-utils.c |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index cf36cb0..d36902f 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -1338,9 +1338,10 @@ mapi_folder_get_message_sync (CamelFolder *folder,
 		GError *local_error = NULL;
 
 		msg = camel_mime_message_new ();
-		camel_stream_reset (stream, NULL);
+
+		g_seekable_seek (G_SEEKABLE (stream), 0, G_SEEK_SET, NULL, NULL);
 		camel_stream_write_to_stream (cache_stream, stream, cancellable, NULL);
-		camel_stream_reset (stream, NULL);
+		g_seekable_seek (G_SEEKABLE (stream), 0, G_SEEK_SET, NULL, NULL);
 		if (!camel_data_wrapper_construct_from_stream_sync ((CamelDataWrapper *) msg, stream, cancellable, &local_error)) {
 			if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
 				g_object_unref (msg);
@@ -1443,7 +1444,7 @@ mapi_folder_get_message_sync (CamelFolder *folder,
 			   composing message in memory, but when they are read from the cache
 			   they appear properly in the UI. */
 			msg2 = camel_mime_message_new ();
-			camel_stream_reset (cache_stream, NULL);
+			g_seekable_seek (G_SEEKABLE (cache_stream), 0, G_SEEK_SET, NULL, NULL);
 			if (!camel_data_wrapper_construct_from_stream_sync (CAMEL_DATA_WRAPPER (msg2), cache_stream, cancellable, NULL)) {
 				g_object_unref (msg2);
 			} else {
diff --git a/src/libexchangemapi/exchange-mapi-mail-utils.c b/src/libexchangemapi/exchange-mapi-mail-utils.c
index 600fa83..1554518 100644
--- a/src/libexchangemapi/exchange-mapi-mail-utils.c
+++ b/src/libexchangemapi/exchange-mapi-mail-utils.c
@@ -846,7 +846,7 @@ mapi_mime_classify_attachments (ExchangeMapiConnection *conn, mapi_id_t fid, con
 
 			mem = camel_stream_mem_new ();
 			camel_stream_write (mem, (const gchar *) stream->value->data, stream->value->len, NULL, NULL);
-			camel_stream_reset (mem, NULL);
+			g_seekable_seek (G_SEEKABLE (mem), 0, G_SEEK_SET, NULL, NULL);
 
 			parser = camel_mime_parser_new ();
 			camel_mime_parser_scan_from (parser, FALSE);



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