clean up a lot. (eos): When testing for end-of-stream, reset the parent

	* camel-seekable-substream.c: clean up a lot.
	(eos): When testing for end-of-stream, reset the parent position
	before testing if it is at end-of-stream, since either (a) it may
	have been seek'ed to eos by someone else, or (b) we may have been
	seek'ed away from eos and it hasn't been synced yet.

svn path=/trunk/; revision=2519

1 files changed, 10 insertions, 13 deletions

diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h
index 72f04601c8..4710f5fd5a 100644
--- a/camel/camel-seekable-substream.h
+++ b/camel/camel-seekable-substream.h
@@ -1,15 +1,15 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* camel-seekable-substream.h : stream */
 
-/* 
+/*
  *
- * Author : 
+ * Author :
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
  * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
  *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
@@ -52,24 +52,21 @@ struct _CamelSeekableSubstream
 	CamelSeekableStream parent_object;
 
 	/*  --**-- Private fields --**--  */
-	CamelSeekableStream *parent_stream;   /* the stream this substream uses */ 
-	guint32 cur_pos;                      /* current postion in the stream */
+	CamelSeekableStream *parent_stream;
 	guint32 inf_bound;                    /* first valid position */
 	gint64  sup_bound;                    /* first invalid position */
-	gboolean open;
 	gboolean eos;
-	
 };
 
 
 
 typedef struct {
 	CamelSeekableStreamClass parent_class;
-	
-	/* Virtual methods */	
-	void (*init_with_seekable_stream_and_bounds) (CamelSeekableSubstream *seekable_substream, 
+
+	/* Virtual methods */
+	void (*init_with_seekable_stream_and_bounds) (CamelSeekableSubstream *seekable_substream,
 						      CamelSeekableStream    *parent_stream,
-						      guint32 inf_bound, 
+						      guint32 inf_bound,
 						      gint64  sup_bound);
 
 } CamelSeekableSubstreamClass;
@@ -85,7 +82,7 @@ GtkType camel_seekable_substream_get_type (void);
 /* obtain a new seekable substream */
 CamelStream *
 camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream    *parent_stream,
-							      guint32                 inf_bound, 
+							      guint32                 inf_bound,
 							      gint64                  sup_bound);
 
 #ifdef __cplusplus