From bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 23 Apr 2010 10:28:53 -0400
Subject: Camel is now GObject-based.

---
 mail/em-utils.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'mail/em-utils.c')

diff --git a/mail/em-utils.c b/mail/em-utils.c
index a1dd9ea565..e0e443331c 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -552,7 +552,7 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr
 	filtered_stream = camel_stream_filter_new (stream);
 	camel_stream_filter_add (
 		CAMEL_STREAM_FILTER (filtered_stream), from_filter);
-	camel_object_unref(from_filter);
+	g_object_unref (from_filter);
 
 	for (i=0; i<uids->len; i++) {
 		CamelMimeMessage *message;
@@ -574,13 +574,13 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr
 			res = -1;
 
 		g_free(from);
-		camel_object_unref(message);
+		g_object_unref (message);
 
 		if (res == -1)
 			break;
 	}
 
-	camel_object_unref(filtered_stream);
+	g_object_unref (filtered_stream);
 
 	return res;
 }
@@ -603,12 +603,12 @@ em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream)
 		/* NB: de-from filter, once written */
 		msg = camel_mime_message_new();
 		if (camel_mime_part_construct_from_parser((CamelMimePart *)msg, mp) == -1) {
-			camel_object_unref(msg);
+			g_object_unref (msg);
 			break;
 		}
 
 		camel_folder_append_message(folder, msg, NULL, NULL, ex);
-		camel_object_unref(msg);
+		g_object_unref (msg);
 
 		if (camel_exception_is_set (ex))
 			break;
@@ -616,7 +616,7 @@ em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream)
 		camel_mime_parser_step(mp, NULL, NULL);
 	}
 
-	camel_object_unref(mp);
+	g_object_unref (mp);
 	if (!camel_exception_is_set(ex))
 		res = 0;
 	camel_exception_free(ex);
@@ -653,7 +653,7 @@ em_utils_selection_set_mailbox (GtkSelectionData *data,
 			data, target, 8,
 			byte_array->data, byte_array->len);
 
-	camel_object_unref (stream);
+	g_object_unref (stream);
 }
 
 /**
@@ -685,7 +685,7 @@ em_utils_selection_get_mailbox (GtkSelectionData *selection_data,
 	stream = (CamelStream *)
 		camel_stream_mem_new_with_buffer ((gchar *) data, length);
 	em_utils_read_messages_from_stream(folder, stream);
-	camel_object_unref(stream);
+	g_object_unref (stream);
 }
 
 /**
@@ -717,8 +717,8 @@ em_utils_selection_get_message (GtkSelectionData *selection_data,
 	msg = camel_mime_message_new();
 	if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg, stream) == 0)
 		camel_folder_append_message(folder, msg, NULL, NULL, ex);
-	camel_object_unref(msg);
-	camel_object_unref(stream);
+	g_object_unref (msg);
+	g_object_unref (stream);
 	camel_exception_free(ex);
 }
 
@@ -808,7 +808,7 @@ em_utils_selection_get_uidlist (GtkSelectionData *selection_data,
 	folder = mail_tool_uri_to_folder((gchar *) data, 0, ex);
 	if (folder) {
 		camel_folder_transfer_messages_to(folder, uids, dest, NULL, move, ex);
-		camel_object_unref(folder);
+		g_object_unref (folder);
 	}
 
 	em_utils_uids_free(uids);
@@ -878,7 +878,7 @@ em_utils_selection_set_urilist(GtkSelectionData *data, CamelFolder *folder, GPtr
 			g_free(uri_crlf);
 		}
 
-		camel_object_unref(fstream);
+		g_object_unref (fstream);
 	} else
 		close(fd);
 
@@ -928,7 +928,7 @@ em_utils_selection_get_urilist (GtkSelectionData *selection_data,
 			stream = camel_stream_fs_new_with_fd(fd);
 			if (stream) {
 				res = em_utils_read_messages_from_stream(folder, stream);
-				camel_object_unref(stream);
+				g_object_unref (stream);
 			} else
 				close(fd);
 		}
@@ -1278,7 +1278,7 @@ em_utils_message_to_html (CamelMimeMessage *message, const gchar *credits, guint
 		camel_stream_write ((CamelStream*)mem, append, strlen (append));
 
 	camel_stream_write((CamelStream *)mem, "", 1);
-	camel_object_unref(mem);
+	g_object_unref (mem);
 
 	text = (gchar *)buf->data;
 	if (len)
@@ -1983,7 +1983,7 @@ emu_remove_from_mail_cache (const GSList *addresses)
 		}
 	}
 
-	camel_object_unref (cia);
+	g_object_unref (cia);
 }
 
 void
-- 
cgit