[gmime] updated StreamWrapper code

[Jeffrey Stedfast <fejj src gnome org>]

commit 079fd458813dba0b91b861b02bef35a3c0a4a6f7
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Fri Nov 19 16:24:05 2010 -0500

    updated StreamWrapper code

 mono/StreamWrapper.cs |  117 ++++++++++++++++++++++++-------------------------
 1 files changed, 57 insertions(+), 60 deletions(-)
---
diff --git a/mono/StreamWrapper.cs b/mono/StreamWrapper.cs
index 843ef04..ed348f8 100644
--- a/mono/StreamWrapper.cs
+++ b/mono/StreamWrapper.cs
@@ -2,151 +2,148 @@ using System;
 using System.IO;
 
 namespace GMime {
-
 	public class StreamWrapper : System.IO.Stream, IDisposable {
-
-		private GMime.Stream gmime_stream;
-
-		public StreamWrapper (GMime.Stream gmime_stream)
+		GMime.Stream stream;
+		
+		public StreamWrapper (GMime.Stream stream)
 		{
-			if (gmime_stream == null)
+			if (stream == null)
 				throw new ArgumentNullException ();
-
-			this.gmime_stream = gmime_stream;
+			
+			this.stream = stream;
 		}
-
+		
 		~StreamWrapper ()
 		{
 			Close ();
 		}
-
-		public void Dispose ()
+		
+		public new void Dispose ()
 		{
 			Close ();
 		}
-
+		
 		public GMime.Stream GMimeStream {
-			get { return this.gmime_stream; }
+			get { return stream; }
 			set { 
 				if (value == null)
 					throw new ArgumentNullException ();
-
-				this.gmime_stream = value;
+				
+				stream = value;
 			}
 		}
-
+		
 		public override bool CanRead {
-			get { return this.gmime_stream == null ? false : true; }
+			get { return stream == null ? false : true; }
 		}
-
+		
 		public override bool CanSeek {
-			get { return this.gmime_stream == null || this.gmime_stream is StreamFilter ? false : true; }
+			get { return stream == null || stream is StreamFilter ? false : true; }
 		}
 		
 		// FIXME: Support writing?
 		public override bool CanWrite {
 			get { return false; }
 		}
-
+		
 		public override long Length {
 			get { 
-				if (this.gmime_stream == null)
+				if (stream == null)
 					throw new ObjectDisposedException ("GMimeStream", "The stream has been closed");
-
-				return this.gmime_stream.Length;
+				
+				return stream.Length;
 			}
 		}
-
+		
 		public override long Position {
 			get { 
-				if (this.gmime_stream == null)
+				if (stream == null)
 					throw new ObjectDisposedException ("GMimeStream", "The stream has been closed");
-
-				return this.gmime_stream.Tell ();
+				
+				return stream.Tell ();
 			}
-
+			
 			set {
 				if (Seek (value, SeekOrigin.Begin) == -1)
 					throw new IOException ();
 			}
 		}
-
+		
 		public override void Close ()
 		{
-			if (this.gmime_stream == null)
+			if (stream == null)
 				throw new ObjectDisposedException ("GMimeStream", "The stream has been closed");
-
-			this.gmime_stream.Dispose ();
-			this.gmime_stream = null;
+			
+			stream.Dispose ();
+			stream = null;
 		}
-
+		
 		public override void Flush ()
 		{
+			stream.Flush ();
 		}
-
+		
 		public override int Read (byte[] buffer, int offset, int count)
 		{
-			if (this.gmime_stream == null)
+			if (stream == null)
 				throw new ObjectDisposedException ("GMimeStream", "The stream has been closed");
-
+			
 			if (offset != 0)
 				throw new ArgumentOutOfRangeException ("offset must be 0");
-
-			int bytes_read = (int) this.gmime_stream.Read (buffer, (uint) count);
-
-			if (bytes_read < 0)
+			
+			int nread = (int) stream.Read (buffer, (uint) count);
+			
+			if (nread < 0)
 				return 0;
-
-			return bytes_read;
+			
+			return nread;
 		}
 
 		public override long Seek (long offset, SeekOrigin origin)
 		{
-			if (this.gmime_stream == null)
+			if (stream == null)
 				throw new ObjectDisposedException ("GMimeStream", "The stream has been closed");
-
-			if (this.gmime_stream is StreamFilter) {
+			
+			if (stream is StreamFilter) {
 				if (offset != 0 || origin != SeekOrigin.Begin)
 					throw new NotSupportedException ();
-
+				
 				// offset = 0 is a special case and means reset the streamfilter
-				((StreamFilter) this.gmime_stream).Reset ();
+				((StreamFilter) stream).Reset ();
 				return 0;
 			}
-
+			
 			long ret = -1;
-
+			
 			switch (origin) {
 			case SeekOrigin.Begin:
 				if (offset < 0)
 					throw new ArgumentOutOfRangeException ();
 				
-				ret = this.gmime_stream.Seek (offset, GMime.SeekWhence.Set);
+				ret = stream.Seek (offset, GMime.SeekWhence.Set);
 				break;
-
 			case SeekOrigin.Current:
-				ret = this.gmime_stream.Seek (offset, GMime.SeekWhence.Cur);
+				ret = stream.Seek (offset, GMime.SeekWhence.Cur);
 				break;
-
 			case SeekOrigin.End:
 				if (offset > 0)
 					throw new ArgumentOutOfRangeException ();
-
-				ret = this.gmime_stream.Seek (offset, GMime.SeekWhence.End);
+				
+				ret = stream.Seek (offset, GMime.SeekWhence.End);
 				break;
 			}
-
+			
 			if (ret == -1)
 				throw new IOException ();
-
+			
 			return ret;
 		}
-
+		
  		public override void SetLength (long value)
 		{
 			throw new NotSupportedException ();
 		}
-
+		
 		public override void Write (byte[] buffer, int offset, int count)
 		{
 			throw new NotSupportedException ();