Make camel not leak like a sieve.

	* camel-object.c: New subclass of GtkObject which is now the base
	of the Camel object hierarchy. Currently the only difference
	between CamelObject and GtkObject is that CamelObjects don't start
	out floating.

	* *.h: Move a bunch of typedefs to camel-types.h. Standardize on
	using <camel/foo.h> in header files rather than <foo.h>, "foo.h",
	or "camel/foo.h". Remove some unneeded includes.

	* camel-address.c, camel-data-wrapper.c, camel-folder-search.c,
	camel-folder-summary.c, camel-folder.c, camel-mime-filter.c,
	camel-mime-parser.c, camel-service.c, camel-session.c,
	camel-stream.c: These are now subclasses of CamelObject.

	* camel-data-wrapper.c (set_output_stream):
	* camel-medium.c (set_content_object):
	* camel-seekable-substream.c
	(init_with_seekable_stream_and_bounds):
	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):
	remove gtk_object_sink calls.

	* camel-stream-buffer.c (init_vbuf):
	* camel-stream-filter.c (camel_stream_filter_new_with_stream):
	ref the original stream.

	* camel-folder-summary.c (camel_folder_summary_finalise): unref
	the filters when finalizing.

	* camel-mime-part-utils.c
	(simple_data_wrapper_construct_from_parser,
	camel_mime_part_construct_content_from_parser):
	* camel-mime-part.c (camel_mime_part_set_content): Unref objects
	that are created only to be handed off to other objects. If
	they're going to be needed later, they will have been additionally
	ref'ed by the object that needs them.

	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
	unref the message stream after creating the data from it.

	* camel-stream.c, camel-stream-buffer.c, camel-stream-filter.c,
	camel-stream-fs.c, camel-stream-mem.c: Remove camel_stream_close,
	since its semantics are dubious (what happens when you close a
	stream other people still have references on?).

	* providers/nntp/camel-nntp-store.c:
	* providers/smtp/camel-smtp-transport.c:
	* providers/pop3/camel-pop3-store.c:
	replace camel_stream_close calls with gtk_object_unref.

	* providers/mbox/camel-mbox-folder.c:
	* providers/nntp/camel-nntp-folder.c:
	* providers/sendmail/camel-sendmail-transport.c:
	replace camel_stream_close with camel_stream_flush +
	gtk_object_unref

svn path=/trunk/; revision=2882

1 files changed, 1 insertions, 11 deletions

diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index 64146d5b2e..7cc1754ad6 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -42,7 +42,6 @@ static gint stream_read (CamelStream *stream, gchar *buffer, gint n);
 static gint stream_write (CamelStream *stream, const gchar *buffer, gint n);
 static void stream_flush (CamelStream *stream);
 static gboolean stream_eos (CamelStream *stream);
-static void stream_close (CamelStream *stream);
 
 static void finalize (GtkObject *object);
 static void destroy (GtkObject *object);
@@ -67,7 +66,6 @@ camel_stream_buffer_class_init (CamelStreamBufferClass *camel_stream_buffer_clas
 	camel_stream_class->write = stream_write;
 	camel_stream_class->flush = stream_flush;
 	camel_stream_class->eos = stream_eos;
-	camel_stream_class->close = stream_close;
 
 	gtk_object_class->finalize = finalize;
 	gtk_object_class->destroy = destroy;
@@ -164,6 +162,7 @@ init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, ch
 	if (sbf->stream)
 		gtk_object_unref(GTK_OBJECT(sbf->stream));
 	sbf->stream = s;
+	gtk_object_ref(GTK_OBJECT(sbf->stream));
 }
 
 static void
@@ -367,15 +366,6 @@ stream_eos (CamelStream *stream)
 	return camel_stream_eos(sbf->stream) && sbf->ptr == sbf->end;
 }
 
-static void
-stream_close (CamelStream *stream)
-{
-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);
-
-	stream_flush(stream);
-	camel_stream_close(sbf->stream);
-}
-
 /**
  * camel_stream_buffer_gets:
  * @sbf: A CamelStreamBuffer.