[evolution-kolab/ek-wip-porting] KolabMailMimeBuilder: build fixes (pt. I)

[Christian Hilberg <chilberg src gnome org>]

commit 54d6d1f20a3a63bcc906baaa946b22e0a58d176f
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Dec 8 13:09:39 2011 +0100

    KolabMailMimeBuilder: build fixes (pt. I)
    
    * replaced CamelObject with GObject
    * removed set-but-not-used variables

 src/libekolab/kolab-mail-mime-builder.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-mime-builder.c b/src/libekolab/kolab-mail-mime-builder.c
index a41ce21..c2bdd91 100644
--- a/src/libekolab/kolab-mail-mime-builder.c
+++ b/src/libekolab/kolab-mail-mime-builder.c
@@ -103,11 +103,11 @@ kolab_mail_mime_builder_dispose (GObject *object)
 static void
 kolab_mail_mime_builder_finalize (GObject *object)
 {
-	KolabMailMimeBuilder *self = NULL;
-	KolabMailMimeBuilderPrivate *priv = NULL;
+	/* KolabMailMimeBuilder *self = NULL; */
+	/* KolabMailMimeBuilderPrivate *priv = NULL; */
 
-	self = KOLAB_MAIL_MIME_BUILDER (object);
-	priv = KOLAB_MAIL_MIME_BUILDER_PRIVATE (self);
+	/* self = KOLAB_MAIL_MIME_BUILDER (object); */
+	/* priv = KOLAB_MAIL_MIME_BUILDER_PRIVATE (self); */
 
 	/* TODO: Add deinitalization code here */
 
@@ -339,7 +339,7 @@ kolab_mail_mime_builder_conv_new_from_camel (KolabMailMimeBuilder *self,
 		if (content_type_str != NULL)
 			g_free (content_type_str);
 		if (memstream != NULL)
-			camel_object_unref (memstream);
+			g_object_unref (memstream);
 		if (buffer != NULL)
 			g_byte_array_free (buffer, TRUE);
 
@@ -519,7 +519,7 @@ kolab_mail_mime_builder_camel_new_from_conv (KolabMailMimeBuilder *self,
 
 	mime_part_skip:
 		if (memstream != NULL)
-			camel_object_unref (memstream);
+			g_object_unref (memstream);
 		if (tmp_err != NULL)
 			break;
 	}
@@ -528,7 +528,7 @@ kolab_mail_mime_builder_camel_new_from_conv (KolabMailMimeBuilder *self,
 		/* clean up everything */
 		if (msg_mimetype != NULL)
 			g_free (msg_mimetype);
-		camel_object_unref (multipart);
+		g_object_unref (multipart);
 		g_propagate_error (err, tmp_err);
 		return NULL;
 	}
@@ -585,7 +585,7 @@ kolab_mail_mime_builder_camel_set_header (KolabMailMimeBuilder *self,
 	cia = camel_internet_address_new ();
 	camel_internet_address_add (cia, headerinfo->from_name, headerinfo->from_addr);
 	camel_mime_message_set_from (message, cia);
-	camel_object_unref (cia);
+	g_object_unref (cia);
 
 	/* TODO more here if KolabMailMimeBuilderHeaderInfo is extended */