GNOME.org
 

gmime r1446 - trunk/gmime

Author: fejj
Date: Sat Sep 13 21:03:46 2008
New Revision: 1446
URL: http://svn.gnome.org/viewvc/gmime?rev=1446&view=rev

Log:
switch to using g_object_newv() instead of g_object_new() as it cuts out a little extra processing overhead

Modified:
   trunk/gmime/gmime-content-type.c
   trunk/gmime/gmime-data-wrapper.c
   trunk/gmime/gmime-disposition.c
   trunk/gmime/gmime-filter-basic.c
   trunk/gmime/gmime-filter-best.c
   trunk/gmime/gmime-filter-charset.c
   trunk/gmime/gmime-filter-crlf.c
   trunk/gmime/gmime-filter-enriched.c
   trunk/gmime/gmime-filter-from.c
   trunk/gmime/gmime-filter-gzip.c
   trunk/gmime/gmime-filter-html.c
   trunk/gmime/gmime-filter-md5.c
   trunk/gmime/gmime-filter-strip.c
   trunk/gmime/gmime-filter-windows.c
   trunk/gmime/gmime-filter-yenc.c
   trunk/gmime/gmime-gpg-context.c
   trunk/gmime/gmime-message-part.c
   trunk/gmime/gmime-message-partial.c
   trunk/gmime/gmime-message.c
   trunk/gmime/gmime-multipart-encrypted.c
   trunk/gmime/gmime-multipart-signed.c
   trunk/gmime/gmime-multipart.c
   trunk/gmime/gmime-object.c
   trunk/gmime/gmime-parser.c
   trunk/gmime/gmime-part.c
   trunk/gmime/gmime-stream-buffer.c
   trunk/gmime/gmime-stream-cat.c
   trunk/gmime/gmime-stream-file.c
   trunk/gmime/gmime-stream-filter.c
   trunk/gmime/gmime-stream-fs.c
   trunk/gmime/gmime-stream-mem.c
   trunk/gmime/gmime-stream-mmap.c
   trunk/gmime/gmime-stream-null.c

Modified: trunk/gmime/gmime-content-type.c
==============================================================================
--- trunk/gmime/gmime-content-type.c	(original)
+++ trunk/gmime/gmime-content-type.c	Sat Sep 13 21:03:46 2008
@@ -151,7 +151,7 @@
 {
 	GMimeContentType *mime_type;
 	
-	mime_type = g_object_new (GMIME_TYPE_CONTENT_TYPE, NULL);
+	mime_type = g_object_newv (GMIME_TYPE_CONTENT_TYPE, 0, NULL);
 	
 	if (type && *type && subtype && *subtype) {
 		mime_type->type = g_strdup (type);
@@ -202,7 +202,7 @@
 	if (!g_mime_parse_content_type (&inptr, &type, &subtype))
 		return g_mime_content_type_new ("application", "octet-stream");
 	
-	mime_type = g_object_new (GMIME_TYPE_CONTENT_TYPE, NULL);
+	mime_type = g_object_newv (GMIME_TYPE_CONTENT_TYPE, 0, NULL);
 	mime_type->subtype = subtype;
 	mime_type->type = type;
 	

Modified: trunk/gmime/gmime-data-wrapper.c
==============================================================================
--- trunk/gmime/gmime-data-wrapper.c	(original)
+++ trunk/gmime/gmime-data-wrapper.c	Sat Sep 13 21:03:46 2008
@@ -117,7 +117,7 @@
 GMimeDataWrapper *
 g_mime_data_wrapper_new (void)
 {
-	return (GMimeDataWrapper *) g_object_new (GMIME_TYPE_DATA_WRAPPER, NULL);
+	return g_object_newv (GMIME_TYPE_DATA_WRAPPER, 0, NULL);
 }
 
 

Modified: trunk/gmime/gmime-disposition.c
==============================================================================
--- trunk/gmime/gmime-disposition.c	(original)
+++ trunk/gmime/gmime-disposition.c	Sat Sep 13 21:03:46 2008
@@ -135,7 +135,7 @@
 {
 	GMimeContentDisposition *disposition;
 	
-	disposition = g_object_new (GMIME_TYPE_CONTENT_DISPOSITION, NULL);
+	disposition = g_object_newv (GMIME_TYPE_CONTENT_DISPOSITION, 0, NULL);
 	disposition->disposition = g_strdup (GMIME_DISPOSITION_ATTACHMENT);
 	
 	return disposition;
@@ -161,7 +161,7 @@
 	if (str == NULL)
 		return g_mime_content_disposition_new ();
 	
-	disposition = g_object_new (GMIME_TYPE_CONTENT_DISPOSITION, NULL);
+	disposition = g_object_newv (GMIME_TYPE_CONTENT_DISPOSITION, 0, NULL);
 	
 	/* get content disposition part */
 	

Modified: trunk/gmime/gmime-filter-basic.c
==============================================================================
--- trunk/gmime/gmime-filter-basic.c	(original)
+++ trunk/gmime/gmime-filter-basic.c	Sat Sep 13 21:03:46 2008
@@ -245,7 +245,7 @@
 {
 	GMimeFilterBasic *basic;
 	
-	basic = g_object_new (GMIME_TYPE_FILTER_BASIC, NULL);
+	basic = g_object_newv (GMIME_TYPE_FILTER_BASIC, 0, NULL);
 	
 	if (encode)
 		g_mime_encoding_init_encode (&basic->encoder, encoding);

Modified: trunk/gmime/gmime-filter-best.c
==============================================================================
--- trunk/gmime/gmime-filter-best.c	(original)
+++ trunk/gmime/gmime-filter-best.c	Sat Sep 13 21:03:46 2008
@@ -244,7 +244,7 @@
 {
 	GMimeFilterBest *new;
 	
-	new = g_object_new (GMIME_TYPE_FILTER_BEST, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_BEST, 0, NULL);
 	new->flags = flags;
 	filter_reset ((GMimeFilter *) new);
 	

Modified: trunk/gmime/gmime-filter-charset.c
==============================================================================
--- trunk/gmime/gmime-filter-charset.c	(original)
+++ trunk/gmime/gmime-filter-charset.c	Sat Sep 13 21:03:46 2008
@@ -284,7 +284,8 @@
  *
  * Creates a new #GMimeFilterCharset filter.
  *
- * Returns: a new charset filter.
+ * Returns: a new charset filter or %NULL if the charset conversion is
+ * not possible.
  **/
 GMimeFilter *
 g_mime_filter_charset_new (const char *from_charset, const char *to_charset)
@@ -296,7 +297,7 @@
 	if (cd == (iconv_t) -1)
 		return NULL;
 	
-	new = g_object_new (GMIME_TYPE_FILTER_CHARSET, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_CHARSET, 0, NULL);
 	new->from_charset = g_strdup (from_charset);
 	new->to_charset = g_strdup (to_charset);
 	new->cd = cd;

Modified: trunk/gmime/gmime-filter-crlf.c
==============================================================================
--- trunk/gmime/gmime-filter-crlf.c	(original)
+++ trunk/gmime/gmime-filter-crlf.c	Sat Sep 13 21:03:46 2008
@@ -232,7 +232,7 @@
 {
 	GMimeFilterCRLF *new;
 	
-	new = g_object_new (GMIME_TYPE_FILTER_CRLF, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_CRLF, 0, NULL);
 	new->encode = encode;
 	new->dots = dots;
 	

Modified: trunk/gmime/gmime-filter-enriched.c
==============================================================================
--- trunk/gmime/gmime-filter-enriched.c	(original)
+++ trunk/gmime/gmime-filter-enriched.c	Sat Sep 13 21:03:46 2008
@@ -604,7 +604,7 @@
 {
 	GMimeFilterEnriched *new;
 	
-	new = (GMimeFilterEnriched *) g_object_new (GMIME_TYPE_FILTER_ENRICHED, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_ENRICHED, 0, NULL);
 	new->flags = flags;
 	
 	return (GMimeFilter *) new;

Modified: trunk/gmime/gmime-filter-from.c
==============================================================================
--- trunk/gmime/gmime-filter-from.c	(original)
+++ trunk/gmime/gmime-filter-from.c	Sat Sep 13 21:03:46 2008
@@ -252,7 +252,7 @@
 {
 	GMimeFilterFrom *new;
 	
-	new = g_object_new (GMIME_TYPE_FILTER_FROM, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_FROM, 0, NULL);
 	new->midline = FALSE;
 	switch (mode) {
 	case GMIME_FILTER_FROM_MODE_ARMOR:

Modified: trunk/gmime/gmime-filter-gzip.c
==============================================================================
--- trunk/gmime/gmime-filter-gzip.c	(original)
+++ trunk/gmime/gmime-filter-gzip.c	Sat Sep 13 21:03:46 2008
@@ -479,7 +479,7 @@
 	GMimeFilterGZip *new;
 	int retval;
 	
-	new = g_object_new (GMIME_TYPE_FILTER_GZIP, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_GZIP, 0, NULL);
 	new->mode = mode;
 	new->level = level;
 	

Modified: trunk/gmime/gmime-filter-html.c
==============================================================================
--- trunk/gmime/gmime-filter-html.c	(original)
+++ trunk/gmime/gmime-filter-html.c	Sat Sep 13 21:03:46 2008
@@ -482,7 +482,7 @@
 	GMimeFilterHTML *new;
 	guint i;
 	
-	new = g_object_new (GMIME_TYPE_FILTER_HTML, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_HTML, 0, NULL);
 	new->flags = flags;
 	new->colour = colour;
 	

Modified: trunk/gmime/gmime-filter-md5.c
==============================================================================
--- trunk/gmime/gmime-filter-md5.c	(original)
+++ trunk/gmime/gmime-filter-md5.c	Sat Sep 13 21:03:46 2008
@@ -162,7 +162,7 @@
 GMimeFilter *
 g_mime_filter_md5_new (void)
 {
-	return (GMimeFilter *) g_object_new (GMIME_TYPE_FILTER_MD5, NULL);
+	return g_object_newv (GMIME_TYPE_FILTER_MD5, 0, NULL);
 }
 
 

Modified: trunk/gmime/gmime-filter-strip.c
==============================================================================
--- trunk/gmime/gmime-filter-strip.c	(original)
+++ trunk/gmime/gmime-filter-strip.c	Sat Sep 13 21:03:46 2008
@@ -180,9 +180,5 @@
 GMimeFilter *
 g_mime_filter_strip_new (void)
 {
-	GMimeFilterStrip *new;
-	
-	new = g_object_new (GMIME_TYPE_FILTER_STRIP, NULL);
-	
-	return (GMimeFilter *) new;
+	return g_object_newv (GMIME_TYPE_FILTER_STRIP, 0, NULL);
 }

Modified: trunk/gmime/gmime-filter-windows.c
==============================================================================
--- trunk/gmime/gmime-filter-windows.c	(original)
+++ trunk/gmime/gmime-filter-windows.c	Sat Sep 13 21:03:46 2008
@@ -185,7 +185,7 @@
 	
 	g_return_val_if_fail (claimed_charset != NULL, NULL);
 	
-	new = g_object_new (GMIME_TYPE_FILTER_WINDOWS, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_WINDOWS, 0, NULL);
 	new->claimed_charset = g_strdup (claimed_charset);
 	
 	return (GMimeFilter *) new;

Modified: trunk/gmime/gmime-filter-yenc.c
==============================================================================
--- trunk/gmime/gmime-filter-yenc.c	(original)
+++ trunk/gmime/gmime-filter-yenc.c	Sat Sep 13 21:03:46 2008
@@ -282,7 +282,7 @@
 {
 	GMimeFilterYenc *new;
 	
-	new = g_object_new (GMIME_TYPE_FILTER_YENC, NULL);
+	new = g_object_newv (GMIME_TYPE_FILTER_YENC, 0, NULL);
 	new->encode = encode;
 	
 	if (encode)

Modified: trunk/gmime/gmime-gpg-context.c
==============================================================================
--- trunk/gmime/gmime-gpg-context.c	(original)
+++ trunk/gmime/gmime-gpg-context.c	Sat Sep 13 21:03:46 2008
@@ -1951,7 +1951,7 @@
 	g_return_val_if_fail (GMIME_IS_SESSION (session), NULL);
 	g_return_val_if_fail (path != NULL, NULL);
 	
-	ctx = g_object_new (GMIME_TYPE_GPG_CONTEXT, NULL);
+	ctx = g_object_newv (GMIME_TYPE_GPG_CONTEXT, 0, NULL);
 	ctx->path = g_strdup (path);
 	
 	cipher = (GMimeCipherContext *) ctx;

Modified: trunk/gmime/gmime-message-part.c
==============================================================================
--- trunk/gmime/gmime-message-part.c	(original)
+++ trunk/gmime/gmime-message-part.c	Sat Sep 13 21:03:46 2008
@@ -234,7 +234,7 @@
 	GMimeContentType *content_type;
 	GMimeMessagePart *part;
 	
-	part = g_object_new (GMIME_TYPE_MESSAGE_PART, NULL);
+	part = g_object_newv (GMIME_TYPE_MESSAGE_PART, 0, NULL);
 	
 	content_type = g_mime_content_type_new ("message", subtype ? subtype : "rfc822");
 	g_mime_object_set_content_type (GMIME_OBJECT (part), content_type);

Modified: trunk/gmime/gmime-message-partial.c
==============================================================================
--- trunk/gmime/gmime-message-partial.c	(original)
+++ trunk/gmime/gmime-message-partial.c	Sat Sep 13 21:03:46 2008
@@ -207,7 +207,7 @@
 	GMimeMessagePartial *partial;
 	char *num;
 	
-	partial = g_object_new (GMIME_TYPE_MESSAGE_PARTIAL, NULL);
+	partial = g_object_newv (GMIME_TYPE_MESSAGE_PARTIAL, 0, NULL);
 	
 	content_type = g_mime_content_type_new ("message", "partial");
 	

Modified: trunk/gmime/gmime-message.c
==============================================================================
--- trunk/gmime/gmime-message.c	(original)
+++ trunk/gmime/gmime-message.c	Sat Sep 13 21:03:46 2008
@@ -1030,7 +1030,7 @@
 	GMimeMessage *message;
 	int i;
 	
-	message = g_object_new (GMIME_TYPE_MESSAGE, NULL);
+	message = g_object_newv (GMIME_TYPE_MESSAGE, 0, NULL);
 	
 	if (pretty_headers) {
 		/* Populate with the "standard" rfc822 headers so we can have a standard order */

Modified: trunk/gmime/gmime-multipart-encrypted.c
==============================================================================
--- trunk/gmime/gmime-multipart-encrypted.c	(original)
+++ trunk/gmime/gmime-multipart-encrypted.c	Sat Sep 13 21:03:46 2008
@@ -199,7 +199,7 @@
 	GMimeMultipartEncrypted *multipart;
 	GMimeContentType *content_type;
 	
-	multipart = g_object_new (GMIME_TYPE_MULTIPART_ENCRYPTED, NULL);
+	multipart = g_object_newv (GMIME_TYPE_MULTIPART_ENCRYPTED, 0, NULL);
 	
 	content_type = g_mime_content_type_new ("multipart", "encrypted");
 	g_mime_object_set_content_type (GMIME_OBJECT (multipart), content_type);

Modified: trunk/gmime/gmime-multipart-signed.c
==============================================================================
--- trunk/gmime/gmime-multipart-signed.c	(original)
+++ trunk/gmime/gmime-multipart-signed.c	Sat Sep 13 21:03:46 2008
@@ -192,7 +192,7 @@
 	GMimeMultipartSigned *multipart;
 	GMimeContentType *content_type;
 	
-	multipart = g_object_new (GMIME_TYPE_MULTIPART_SIGNED, NULL);
+	multipart = g_object_newv (GMIME_TYPE_MULTIPART_SIGNED, 0, NULL);
 	
 	content_type = g_mime_content_type_new ("multipart", "signed");
 	g_mime_object_set_content_type (GMIME_OBJECT (multipart), content_type);

Modified: trunk/gmime/gmime-multipart.c
==============================================================================
--- trunk/gmime/gmime-multipart.c	(original)
+++ trunk/gmime/gmime-multipart.c	Sat Sep 13 21:03:46 2008
@@ -316,7 +316,7 @@
 	GMimeContentType *content_type;
 	GMimeMultipart *multipart;
 	
-	multipart = g_object_new (GMIME_TYPE_MULTIPART, NULL);
+	multipart = g_object_newv (GMIME_TYPE_MULTIPART, 0, NULL);
 	
 	content_type = g_mime_content_type_new ("multipart", "mixed");
 	g_mime_object_set_content_type (GMIME_OBJECT (multipart), content_type);
@@ -342,7 +342,7 @@
 	GMimeContentType *content_type;
 	GMimeMultipart *multipart;
 	
-	multipart = g_object_new (GMIME_TYPE_MULTIPART, NULL);
+	multipart = g_object_newv (GMIME_TYPE_MULTIPART, 0, NULL);
 	
 	content_type = g_mime_content_type_new ("multipart", subtype ? subtype : "mixed");
 	g_mime_object_set_content_type (GMIME_OBJECT (multipart), content_type);

Modified: trunk/gmime/gmime-object.c
==============================================================================
--- trunk/gmime/gmime-object.c	(original)
+++ trunk/gmime/gmime-object.c	Sat Sep 13 21:03:46 2008
@@ -344,7 +344,7 @@
 			return NULL;
 	}
 	
-	object = g_object_new (obj_type, NULL);
+	object = g_object_newv (obj_type, 0, NULL);
 	
 	g_mime_object_set_content_type (object, content_type);
 	
@@ -372,7 +372,6 @@
 {
 	struct _type_bucket *bucket;
 	struct _subtype_bucket *sub;
-	GMimeObject *object;
 	GType obj_type;
 	
 	g_return_val_if_fail (type != NULL, NULL);
@@ -400,9 +399,7 @@
 			return NULL;
 	}
 	
-	object = g_object_new (obj_type, NULL);
-	
-	return object;
+	return g_object_newv (obj_type, 0, NULL);
 }
 
 

Modified: trunk/gmime/gmime-parser.c
==============================================================================
--- trunk/gmime/gmime-parser.c	(original)
+++ trunk/gmime/gmime-parser.c	Sat Sep 13 21:03:46 2008
@@ -378,11 +378,7 @@
 GMimeParser *
 g_mime_parser_new (void)
 {
-	GMimeParser *parser;
-	
-	parser = g_object_new (GMIME_TYPE_PARSER, NULL);
-	
-	return parser;
+	return g_object_newv (GMIME_TYPE_PARSER, 0, NULL);
 }
 
 
@@ -1232,7 +1228,7 @@
 		d(printf ("'%.*s' not a boundary\n", len, start));
 	}
 	
-	return 0;
+	return FOUND_NOTHING;
 }
 
 /* Optimization Notes:

Modified: trunk/gmime/gmime-part.c
==============================================================================
--- trunk/gmime/gmime-part.c	(original)
+++ trunk/gmime/gmime-part.c	Sat Sep 13 21:03:46 2008
@@ -419,7 +419,7 @@
 	GMimeContentType *content_type;
 	GMimePart *mime_part;
 	
-	mime_part = g_object_new (GMIME_TYPE_PART, NULL);
+	mime_part = g_object_newv (GMIME_TYPE_PART, 0, NULL);
 	
 	content_type = g_mime_content_type_new ("text", "plain");
 	g_mime_object_set_content_type (GMIME_OBJECT (mime_part), content_type);
@@ -444,7 +444,7 @@
 	GMimeContentType *content_type;
 	GMimePart *mime_part;
 	
-	mime_part = g_object_new (GMIME_TYPE_PART, NULL);
+	mime_part = g_object_newv (GMIME_TYPE_PART, 0, NULL);
 	
 	content_type = g_mime_content_type_new (type, subtype);
 	g_mime_object_set_content_type (GMIME_OBJECT (mime_part), content_type);

Modified: trunk/gmime/gmime-stream-buffer.c
==============================================================================
--- trunk/gmime/gmime-stream-buffer.c	(original)
+++ trunk/gmime/gmime-stream-buffer.c	Sat Sep 13 21:03:46 2008
@@ -601,7 +601,7 @@
 	
 	g_return_val_if_fail (GMIME_IS_STREAM (source), NULL);
 	
-	buffer = g_object_new (GMIME_TYPE_STREAM_BUFFER, NULL);
+	buffer = g_object_newv (GMIME_TYPE_STREAM_BUFFER, 0, NULL);
 	
 	buffer->source = source;
 	g_object_ref (source);

Modified: trunk/gmime/gmime-stream-cat.c
==============================================================================
--- trunk/gmime/gmime-stream-cat.c	(original)
+++ trunk/gmime/gmime-stream-cat.c	Sat Sep 13 21:03:46 2008
@@ -639,7 +639,7 @@
 	} while (n != NULL);
 	
 	d(fprintf (stderr, "returning a substream containing multiple source streams\n"));
-	cat = g_object_new (GMIME_TYPE_STREAM_CAT, NULL);
+	cat = g_object_newv (GMIME_TYPE_STREAM_CAT, 0, NULL);
 	/* Note: we could pass -1 as bound_end, it should Just
 	 * Work(tm) but setting absolute bounds is kinda
 	 * nice... */
@@ -680,13 +680,12 @@
 GMimeStream *
 g_mime_stream_cat_new (void)
 {
-	GMimeStreamCat *cat;
+	GMimeStream *stream;
 	
-	cat = g_object_new (GMIME_TYPE_STREAM_CAT, NULL);
+	stream = g_object_newv (GMIME_TYPE_STREAM_CAT, 0, NULL);
+	g_mime_stream_construct (stream, 0, -1);
 	
-	g_mime_stream_construct (GMIME_STREAM (cat), 0, -1);
-	
-	return (GMimeStream *) cat;
+	return stream;
 }
 
 

Modified: trunk/gmime/gmime-stream-file.c
==============================================================================
--- trunk/gmime/gmime-stream-file.c	(original)
+++ trunk/gmime/gmime-stream-file.c	Sat Sep 13 21:03:46 2008
@@ -302,7 +302,7 @@
 {
 	GMimeStreamFile *fstream;
 	
-	fstream = g_object_new (GMIME_TYPE_STREAM_FILE, NULL);
+	fstream = g_object_newv (GMIME_TYPE_STREAM_FILE, 0, NULL);
 	g_mime_stream_construct (GMIME_STREAM (fstream), start, end);
 	fstream->owner = FALSE;
 	fstream->fp = GMIME_STREAM_FILE (stream)->fp;
@@ -331,7 +331,7 @@
 	if ((start = ftell (fp)) == -1)
 		start = 0;
 	
-	fstream = g_object_new (GMIME_TYPE_STREAM_FILE, NULL);
+	fstream = g_object_newv (GMIME_TYPE_STREAM_FILE, 0, NULL);
 	g_mime_stream_construct (GMIME_STREAM (fstream), start, -1);
 	fstream->owner = TRUE;
 	fstream->fp = fp;
@@ -359,7 +359,7 @@
 {
 	GMimeStreamFile *fstream;
 	
-	fstream = g_object_new (GMIME_TYPE_STREAM_FILE, NULL);
+	fstream = g_object_newv (GMIME_TYPE_STREAM_FILE, 0, NULL);
 	g_mime_stream_construct (GMIME_STREAM (fstream), start, end);
 	fstream->owner = TRUE;
 	fstream->fp = fp;

Modified: trunk/gmime/gmime-stream-filter.c
==============================================================================
--- trunk/gmime/gmime-stream-filter.c	(original)
+++ trunk/gmime/gmime-stream-filter.c	Sat Sep 13 21:03:46 2008
@@ -364,7 +364,7 @@
 	GMimeStreamFilter *filter = (GMimeStreamFilter *) stream;
 	GMimeStreamFilter *sub;
 	
-	sub = g_object_new (GMIME_TYPE_STREAM_FILTER, NULL);
+	sub = g_object_newv (GMIME_TYPE_STREAM_FILTER, 0, NULL);
 	sub->source = filter->source;
 	g_object_ref (sub->source);
 	
@@ -414,7 +414,7 @@
 	
 	g_return_val_if_fail (GMIME_IS_STREAM (stream), NULL);
 	
-	filter = g_object_new (GMIME_TYPE_STREAM_FILTER, NULL);
+	filter = g_object_newv (GMIME_TYPE_STREAM_FILTER, 0, NULL);
 	filter->source = stream;
 	g_object_ref (stream);
 	

Modified: trunk/gmime/gmime-stream-fs.c
==============================================================================
--- trunk/gmime/gmime-stream-fs.c	(original)
+++ trunk/gmime/gmime-stream-fs.c	Sat Sep 13 21:03:46 2008
@@ -347,7 +347,7 @@
 {
 	GMimeStreamFs *fs;
 	
-	fs = g_object_new (GMIME_TYPE_STREAM_FS, NULL);
+	fs = g_object_newv (GMIME_TYPE_STREAM_FS, 0, NULL);
 	g_mime_stream_construct (GMIME_STREAM (fs), start, end);
 	fs->fd = GMIME_STREAM_FS (stream)->fd;
 	fs->owner = FALSE;
@@ -374,7 +374,7 @@
 	if ((start = lseek (fd, (off_t) 0, SEEK_CUR)) == -1)
 		start = 0;
 	
-	fs = g_object_new (GMIME_TYPE_STREAM_FS, NULL);
+	fs = g_object_newv (GMIME_TYPE_STREAM_FS, 0, NULL);
 	g_mime_stream_construct (GMIME_STREAM (fs), start, -1);
 	fs->owner = TRUE;
 	fs->eos = FALSE;
@@ -400,7 +400,7 @@
 {
 	GMimeStreamFs *fs;
 	
-	fs = g_object_new (GMIME_TYPE_STREAM_FS, NULL);
+	fs = g_object_newv (GMIME_TYPE_STREAM_FS, 0, NULL);
 	g_mime_stream_construct (GMIME_STREAM (fs), start, end);
 	fs->owner = TRUE;
 	fs->eos = FALSE;

Modified: trunk/gmime/gmime-stream-mem.c
==============================================================================
--- trunk/gmime/gmime-stream-mem.c	(original)
+++ trunk/gmime/gmime-stream-mem.c	Sat Sep 13 21:03:46 2008
@@ -276,13 +276,12 @@
 {
 	GMimeStreamMem *mem;
 	
-	mem = g_object_new (GMIME_TYPE_STREAM_MEM, NULL);
-	mem->owner = FALSE;
+	mem = g_object_newv (GMIME_TYPE_STREAM_MEM, 0, NULL);
+	g_mime_stream_construct ((GMimeStream *) mem, start, end);
 	mem->buffer = GMIME_STREAM_MEM (stream)->buffer;
+	mem->owner = FALSE;
 	
-	g_mime_stream_construct (GMIME_STREAM (mem), start, end);
-	
-	return GMIME_STREAM (mem);
+	return (GMimeStream *) mem;
 }
 
 
@@ -298,13 +297,12 @@
 {
 	GMimeStreamMem *mem;
 	
-	mem = g_object_new (GMIME_TYPE_STREAM_MEM, NULL);
+	mem = g_object_newv (GMIME_TYPE_STREAM_MEM, 0, NULL);
+	g_mime_stream_construct ((GMimeStream *) mem, 0, -1);
 	mem->buffer = g_byte_array_new ();
 	mem->owner = TRUE;
 	
-	g_mime_stream_construct (GMIME_STREAM (mem), 0, -1);
-	
-	return GMIME_STREAM (mem);
+	return (GMimeStream *) mem;
 }
 
 
@@ -321,13 +319,12 @@
 {
 	GMimeStreamMem *mem;
 	
-	mem = g_object_new (GMIME_TYPE_STREAM_MEM, NULL);
-	mem->owner = TRUE;
+	mem = g_object_newv (GMIME_TYPE_STREAM_MEM, 0, NULL);
+	g_mime_stream_construct ((GMimeStream *) mem, 0, -1);
 	mem->buffer = array;
+	mem->owner = TRUE;
 	
-	g_mime_stream_construct (GMIME_STREAM (mem), 0, -1);
-	
-	return GMIME_STREAM (mem);
+	return (GMimeStream *) mem;
 }
 
 
@@ -346,15 +343,14 @@
 {
 	GMimeStreamMem *mem;
 	
-	mem = g_object_new (GMIME_TYPE_STREAM_MEM, NULL);
-	mem->owner = TRUE;
+	mem = g_object_newv (GMIME_TYPE_STREAM_MEM, 0, NULL);
+	g_mime_stream_construct ((GMimeStream *) mem, 0, -1);
 	mem->buffer = g_byte_array_new ();
+	mem->owner = TRUE;
 	
 	g_byte_array_append (mem->buffer, (unsigned char *) buffer, len);
 	
-	g_mime_stream_construct (GMIME_STREAM (mem), 0, -1);
-	
-	return GMIME_STREAM (mem);
+	return (GMimeStream *) mem;
 }
 
 

Modified: trunk/gmime/gmime-stream-mmap.c
==============================================================================
--- trunk/gmime/gmime-stream-mmap.c	(original)
+++ trunk/gmime/gmime-stream-mmap.c	Sat Sep 13 21:03:46 2008
@@ -325,16 +325,15 @@
 	/* FIXME: maybe we should return a GMimeStreamFs? */
 	GMimeStreamMmap *mstream;
 	
-	mstream = g_object_new (GMIME_TYPE_STREAM_MMAP, NULL);
-	mstream->owner = FALSE;
+	mstream = g_object_newv (GMIME_TYPE_STREAM_MMAP, 0, NULL);
+	g_mime_stream_construct (GMIME_STREAM (mstream), start, end);
 	mstream->fd = GMIME_STREAM_MMAP (stream)->fd;
+	mstream->owner = FALSE;
 	
-	mstream->map = GMIME_STREAM_MMAP (stream)->map;
 	mstream->maplen = GMIME_STREAM_MMAP (stream)->maplen;
+	mstream->map = GMIME_STREAM_MMAP (stream)->map;
 	
-	g_mime_stream_construct (GMIME_STREAM (mstream), start, end);
-	
-	return GMIME_STREAM (mstream);
+	return (GMimeStream *) mstream;
 }
 
 
@@ -368,16 +367,15 @@
 	if (map == MAP_FAILED)
 		return NULL;
 	
-	mstream = g_object_new (GMIME_TYPE_STREAM_MMAP, NULL);
+	mstream = g_object_newv (GMIME_TYPE_STREAM_MMAP, 0, NULL);
+	g_mime_stream_construct ((GMimeStream *) mstream, start, -1);
 	mstream->owner = TRUE;
 	mstream->eos = FALSE;
 	mstream->fd = fd;
 	mstream->map = map;
 	mstream->maplen = st.st_size;
 	
-	g_mime_stream_construct (GMIME_STREAM (mstream), start, -1);
-	
-	return GMIME_STREAM (mstream);
+	return (GMimeStream *) mstream;
 #else
 	return NULL;
 #endif /* HAVE_MMAP */
@@ -417,16 +415,15 @@
 	if ((map = mmap (NULL, len, prot, flags, fd, 0)) == MAP_FAILED)
 		return NULL;
 	
-	mstream = g_object_new (GMIME_TYPE_STREAM_MMAP, NULL);
+	mstream = g_object_newv (GMIME_TYPE_STREAM_MMAP, 0, NULL);
+	g_mime_stream_construct ((GMimeStream *) mstream, start, end);
 	mstream->owner = TRUE;
 	mstream->eos = FALSE;
 	mstream->fd = fd;
 	mstream->map = map;
 	mstream->maplen = len;
 	
-	g_mime_stream_construct (GMIME_STREAM (mstream), start, end);
-	
-	return GMIME_STREAM (mstream);
+	return (GMimeStream *) mstream;
 #else
 	return NULL;
 #endif /* HAVE_MMAP */

Modified: trunk/gmime/gmime-stream-null.c
==============================================================================
--- trunk/gmime/gmime-stream-null.c	(original)
+++ trunk/gmime/gmime-stream-null.c	Sat Sep 13 21:03:46 2008
@@ -215,7 +215,7 @@
 static ssize_t
 stream_length (GMimeStream *stream)
 {
-	GMimeStreamNull *null = GMIME_STREAM_NULL (stream);
+	GMimeStreamNull *null = (GMimeStreamNull *) stream;
 	gint64 bound_end;
 	
 	bound_end = stream->bound_end != -1 ? stream->bound_end : null->written;
@@ -226,13 +226,12 @@
 static GMimeStream *
 stream_substream (GMimeStream *stream, gint64 start, gint64 end)
 {
-	GMimeStreamNull *null;
+	GMimeStream *null;
 	
-	null = g_object_new (GMIME_TYPE_STREAM_NULL, NULL);
+	null = g_object_newv (GMIME_TYPE_STREAM_NULL, 0, NULL);
+	g_mime_stream_construct (null, start, end);
 	
-	g_mime_stream_construct (GMIME_STREAM (null), start, end);
-	
-	return GMIME_STREAM (null);
+	return null;
 }
 
 
@@ -246,11 +245,10 @@
 GMimeStream *
 g_mime_stream_null_new (void)
 {
-	GMimeStreamNull *null;
-	
-	null = g_object_new (GMIME_TYPE_STREAM_NULL, NULL);
+	GMimeStream *null;
 	
-	g_mime_stream_construct (GMIME_STREAM (null), 0, -1);
+	null = g_object_newv (GMIME_TYPE_STREAM_NULL, 0, NULL);
+	g_mime_stream_construct (null, 0, -1);
 	
-	return GMIME_STREAM (null);
+	return null;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]