GNOME.org
 

[evolution-exchange/camel-gobject: 2/6] Replace camel_object_unref() with g_object_unref().

commit 79613b5157e05d433d0d65bac9b5bd269d234f4a
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Nov 28 19:14:41 2009 -0500

    Replace camel_object_unref() with g_object_unref().

 addressbook/e-book-backend-exchange.c |   26 +++++++++++-----------
 calendar/e-cal-backend-exchange.c     |   22 +++++++++---------
 camel/camel-exchange-folder.c         |   38 ++++++++++++++++----------------
 camel/camel-exchange-journal.c        |   22 +++++++++---------
 camel/camel-exchange-store.c          |    6 ++--
 camel/camel-exchange-transport.c      |    8 +++---
 eplugin/exchange-delegates-user.c     |   18 +++++++-------
 7 files changed, 70 insertions(+), 70 deletions(-)
---
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index f4ceaa1..c367d6c 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -490,7 +490,7 @@ e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
 				e_vcard_attribute_add_value (attr, value);
 
 			g_free (value);
-			camel_object_unref (addr);
+			g_object_unref (addr);
 
 			e_vcard_attribute_add_param_with_value (attr,
 					e_vcard_attribute_param_new (EEX_X_MEMBERID),
@@ -522,7 +522,7 @@ e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
 	soup_buffer_free (response);
 	msg = camel_mime_message_new ();
 	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	content = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
 	if (CAMEL_IS_MULTIPART (content)) {
@@ -552,11 +552,11 @@ e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
 			photo.data.inlined.length = stream_mem->buffer->len;
 			e_contact_set (contact, E_CONTACT_PHOTO, &photo);
 
-			camel_object_unref (stream);
+			g_object_unref (stream);
 		}
 	}
 
-	camel_object_unref (msg);
+	g_object_unref (msg);
 	return contact;
 }
 
@@ -1358,14 +1358,14 @@ build_message (const gchar *from_name, const gchar *from_email,
 	from = camel_internet_address_new ();
 	camel_internet_address_add (from, from_name, from_email);
 	camel_mime_message_set_from (msg, from);
-	camel_object_unref (from);
+	g_object_unref (from);
 
 	/* Create the body */
 	if (note) {
 		stream = camel_stream_mem_new_with_buffer (note, strlen (note));
 		wrapper = camel_data_wrapper_new ();
 		camel_data_wrapper_construct_from_stream (wrapper, stream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 
 		type = camel_content_type_new ("text", "plain");
 		camel_content_type_set_param (type, "charset", "UTF-8");
@@ -1419,7 +1419,7 @@ build_message (const gchar *from_name, const gchar *from_email,
 
 		wrapper = camel_data_wrapper_new ();
 		camel_data_wrapper_construct_from_stream (wrapper, stream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 		camel_data_wrapper_set_mime_type (wrapper, content_type);
 
 		photo_part = camel_mime_part_new ();
@@ -1436,22 +1436,22 @@ build_message (const gchar *from_name, const gchar *from_email,
 		camel_multipart_set_boundary (multipart, NULL);
 		if (text_part) {
 			camel_multipart_add_part (multipart, text_part);
-			camel_object_unref (text_part);
+			g_object_unref (text_part);
 		}
 		camel_multipart_add_part (multipart, photo_part);
-		camel_object_unref (photo_part);
+		g_object_unref (photo_part);
 
 		camel_medium_set_content_object (CAMEL_MEDIUM (msg),
 						 CAMEL_DATA_WRAPPER (multipart));
-		camel_object_unref (multipart);
+		g_object_unref (multipart);
 	}
 
 	buffer = g_byte_array_new();
 	stream = camel_stream_mem_new ();
 	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer);
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream);
-	camel_object_unref (stream);
-	camel_object_unref (msg);
+	g_object_unref (stream);
+	g_object_unref (msg);
 
 	return buffer;
 }
@@ -1622,7 +1622,7 @@ merge_contact_lists (EBookBackendExchange *be, const gchar *location, EContact *
 				}
 			}
 		}
-		camel_object_unref (addr);
+		g_object_unref (addr);
 	}
 
 	/* remove all the members from the server which left - they has been removed during editing probably */
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index 483b2a1..b9697a2 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -1739,7 +1739,7 @@ get_attachment (ECalBackendExchange *cbex, const gchar *uid,
 	stream = camel_stream_mem_new_with_buffer (body, len);
 	msg = camel_mime_message_new ();
 	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	msg_content = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
 	if (msg_content && CAMEL_IS_MULTIPART (msg_content)) {
@@ -1766,12 +1766,12 @@ get_attachment (ECalBackendExchange *cbex, const gchar *uid,
 				d(printf ("attach file name : %s\n", attach_file_url));
 				list = g_slist_append (list, attach_file_url);
 
-				camel_object_unref (stream);
+				g_object_unref (stream);
 			}
 		} /* Loop through each multipart */
 	}
 
-	camel_object_unref (msg);
+	g_object_unref (msg);
 	return list;
 }
 
@@ -1988,7 +1988,7 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
 	camel_mime_message_set_from (msg, from);
 	g_free (from_name);
 	g_free (from_email);
-	camel_object_unref (from);
+	g_object_unref (from);
 
 	e_cal_component_get_uid (comp, &uid);
 	e_cal_component_get_attachment_list (comp, &attach_list);
@@ -2036,7 +2036,7 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
 		stream = camel_stream_mem_new_with_buffer (file_contents, len);
 		wrapper = camel_data_wrapper_new ();
 		camel_data_wrapper_construct_from_stream (wrapper, stream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 
 		mime_type = get_mime_type (dest_url);
 		if (mime_type) {
@@ -2059,18 +2059,18 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
 		camel_multipart_set_boundary (multipart, NULL);
 		*boundary = g_strdup (camel_multipart_get_boundary (multipart));
 		camel_multipart_add_part (multipart, mime_part);
-		camel_object_unref (mime_part);
+		g_object_unref (mime_part);
 		g_free (cid);
 	}
 	if (!new_attach_list) {
-		camel_object_unref (multipart);
-		camel_object_unref (msg);
+		g_object_unref (multipart);
+		g_object_unref (msg);
 		return NULL;
 	}
 	e_cal_component_set_attachment_list (comp, new_attach_list);
 
 	camel_medium_set_content_object (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (multipart));
-	camel_object_unref (multipart);
+	g_object_unref (multipart);
 
 	content = (CamelStreamMem *)camel_stream_mem_new();
 	dw = camel_medium_get_content_object (CAMEL_MEDIUM (msg));
@@ -2078,8 +2078,8 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
 	buffer = g_memdup (content->buffer->data, content->buffer->len);
 	buffer[content->buffer->len] = '\0';
 	d(printf ("|| Buffer: \n%s\n", buffer));
-	camel_object_unref (content);
-	camel_object_unref (msg);
+	g_object_unref (content);
+	g_object_unref (msg);
 
 	return buffer;
 }
diff --git a/camel/camel-exchange-folder.c b/camel/camel-exchange-folder.c
index 7625aed..9cebcc7 100644
--- a/camel/camel-exchange-folder.c
+++ b/camel/camel-exchange-folder.c
@@ -124,7 +124,7 @@ free_index_and_mid (gpointer thread_index, gpointer message_id, gpointer d)
 static void
 finalize (CamelExchangeFolder *exch)
 {
-	camel_object_unref (CAMEL_OBJECT (exch->cache));
+	g_object_unref (CAMEL_OBJECT (exch->cache));
 
 	if (exch->thread_index_to_message_id) {
 		g_hash_table_foreach (exch->thread_index_to_message_id,
@@ -198,7 +198,7 @@ exchange_expunge (CamelFolder *folder, CamelException *ex)
 	uids = camel_folder_get_uids (trash);
 	camel_exchange_utils_expunge_uids (CAMEL_SERVICE (trash->parent_store), trash->full_name, uids, ex);
 	camel_folder_free_uids (trash, uids);
-	camel_object_unref (CAMEL_OBJECT (trash));
+	g_object_unref (CAMEL_OBJECT (trash));
 }
 
 static void
@@ -229,7 +229,7 @@ append_message_data (CamelFolder *folder, GByteArray *message,
 					    (gchar *) message->data,
 					    message->len);
 			camel_stream_flush (stream_cache);
-			camel_object_unref (CAMEL_OBJECT (stream_cache));
+			g_object_unref (CAMEL_OBJECT (stream_cache));
 		}
 		if (appended_uid)
 			*appended_uid = new_uid;
@@ -287,7 +287,7 @@ append_message (CamelFolder *folder, CamelMimeMessage *message,
 			     camel_mime_message_get_subject (message),
 			     info, appended_uid, ex);
 
-	camel_object_unref (CAMEL_OBJECT (stream_mem));
+	g_object_unref (CAMEL_OBJECT (stream_mem));
 }
 
 static void
@@ -340,7 +340,7 @@ fix_broken_multipart_related (CamelMimePart *part)
 
 		camel_medium_set_content_object (CAMEL_MEDIUM (part),
 						 CAMEL_DATA_WRAPPER (new));
-		camel_object_unref (CAMEL_OBJECT (new));
+		g_object_unref (CAMEL_OBJECT (new));
 	}
 }
 
@@ -367,8 +367,8 @@ get_message_data (CamelFolder *folder, const gchar *uid, CamelException *ex)
 		camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream_mem), ba);
 		camel_stream_reset (stream);
 		camel_stream_write_to_stream (stream, stream_mem);
-		camel_object_unref (CAMEL_OBJECT (stream_mem));
-		camel_object_unref (CAMEL_OBJECT (stream));
+		g_object_unref (CAMEL_OBJECT (stream_mem));
+		g_object_unref (CAMEL_OBJECT (stream));
 
 		return ba;
 	}
@@ -390,7 +390,7 @@ get_message_data (CamelFolder *folder, const gchar *uid, CamelException *ex)
 
 	camel_stream_write (stream, (gchar *) ba->data, ba->len);
 	camel_stream_flush (stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
+	g_object_unref (CAMEL_OBJECT (stream));
 
 	return ba;
 }
@@ -418,13 +418,13 @@ get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
 	filtered_stream = camel_stream_filter_new_with_stream (stream);
 	camel_stream_filter_add (filtered_stream, crlffilter);
-	camel_object_unref (CAMEL_OBJECT (crlffilter));
-	camel_object_unref (CAMEL_OBJECT (stream));
+	g_object_unref (CAMEL_OBJECT (crlffilter));
+	g_object_unref (CAMEL_OBJECT (stream));
 
 	msg = camel_mime_message_new ();
 	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg),
 						  CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
+	g_object_unref (CAMEL_OBJECT (filtered_stream));
 	camel_mime_message_set_source (msg, exch->source);
 
 	if (camel_medium_get_header (CAMEL_MEDIUM (msg), "Sender")) {
@@ -460,7 +460,7 @@ search_by_expression (CamelFolder *folder, const gchar *expression,
 	camel_folder_search_set_folder (search, folder);
 	matches = camel_folder_search_search (search, expression, NULL, ex);
 
-	camel_object_unref (CAMEL_OBJECT (search));
+	g_object_unref (CAMEL_OBJECT (search));
 
 	return matches;
 }
@@ -476,7 +476,7 @@ count_by_expression (CamelFolder *folder, const gchar *expression,
 	camel_folder_search_set_folder (search, folder);
 	matches = camel_folder_search_count (search, expression, ex);
 
-	camel_object_unref (CAMEL_OBJECT (search));
+	g_object_unref (CAMEL_OBJECT (search));
 
 	return matches;
 }
@@ -502,7 +502,7 @@ search_by_uids (CamelFolder *folder, const gchar *expression,
 	camel_folder_search_set_summary (search, uids);
 	matches = camel_folder_search_execute_expression (search, expression, ex);
 
-	camel_object_unref (CAMEL_OBJECT (search));
+	g_object_unref (CAMEL_OBJECT (search));
 
 	return matches;
 }
@@ -577,9 +577,9 @@ cache_xfer (CamelExchangeFolder *folder_source, CamelExchangeFolder *folder_dest
 					     dest_uids->pdata[i], NULL);
 		if (dest) {
 			camel_stream_write_to_stream (src, dest);
-			camel_object_unref (CAMEL_OBJECT (dest));
+			g_object_unref (CAMEL_OBJECT (dest));
 		}
-		camel_object_unref (CAMEL_OBJECT (src));
+		g_object_unref (CAMEL_OBJECT (src));
 
 		if (delete) {
 			camel_data_cache_remove (folder_source->cache, "cache",
@@ -620,7 +620,7 @@ transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 							 info, uids->pdata[i], NULL,
 							 delete_originals, ex);
 
-			camel_object_unref (message);
+			g_object_unref (message);
 
 			if (camel_exception_is_set (ex))
 				break;
@@ -722,7 +722,7 @@ camel_exchange_folder_add_message (CamelExchangeFolder *exch,
 	stream = camel_stream_mem_new_with_buffer (headers, strlen (headers));
 	msg = camel_mime_message_new ();
 	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);
-	camel_object_unref (CAMEL_OBJECT (stream));
+	g_object_unref (CAMEL_OBJECT (stream));
 
 	info = camel_folder_summary_info_new_from_message (folder->summary, msg, NULL);
 	einfo = (CamelExchangeMessageInfo *)info;
@@ -742,7 +742,7 @@ camel_exchange_folder_add_message (CamelExchangeFolder *exch,
 			einfo->info.references->size = 1;
 		}
 	}
-	camel_object_unref (CAMEL_OBJECT (msg));
+	g_object_unref (CAMEL_OBJECT (msg));
 
 	info->uid = camel_pstring_strdup (uid);
 	einfo->info.flags = flags;
diff --git a/camel/camel-exchange-journal.c b/camel/camel-exchange-journal.c
index c72ea9a..27dc5b7 100644
--- a/camel/camel-exchange-journal.c
+++ b/camel/camel-exchange-journal.c
@@ -256,12 +256,12 @@ exchange_entry_play_append (CamelOfflineJournal *journal, CamelExchangeJournalEn
 
 	message = camel_mime_message_new ();
 	if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream) == -1) {
-		camel_object_unref (message);
-		camel_object_unref (stream);
+		g_object_unref (message);
+		g_object_unref (stream);
 		goto done;
 	}
 
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	if (!(info = camel_folder_summary_uid (folder->summary, entry->uid))) {
 		/* Should have never happened, but create a new info to avoid further crashes */
@@ -277,7 +277,7 @@ exchange_entry_play_append (CamelOfflineJournal *journal, CamelExchangeJournalEn
 	}
 
 	real = camel_folder_summary_info_new_from_message (folder->summary, message, NULL);
-	camel_object_unref (message);
+	g_object_unref (message);
 
 	if (uid != NULL && real) {
 		real->uid = camel_pstring_strdup (uid);
@@ -313,12 +313,12 @@ exchange_entry_play_transfer (CamelOfflineJournal *journal, CamelExchangeJournal
 
 	message = camel_mime_message_new ();
 	if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream) == -1) {
-		camel_object_unref (message);
-		camel_object_unref (stream);
+		g_object_unref (message);
+		g_object_unref (stream);
 		goto done;
 	}
 
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	if (!(info = camel_folder_summary_uid (folder->summary, entry->uid))) {
 		/* Note: this should never happen, but rather than crash lets make a new info */
@@ -343,7 +343,7 @@ exchange_entry_play_transfer (CamelOfflineJournal *journal, CamelExchangeJournal
 		camel_folder_transfer_messages_to (src, uids, folder, &xuids, entry->delete_original, &lex);
 		if (!camel_exception_is_set (&lex)) {
 			real = camel_folder_summary_info_new_from_message (folder->summary, message, NULL);
-			camel_object_unref (message);
+			g_object_unref (message);
 			real->uid = camel_pstring_strdup ((gchar *)xuids->pdata[0]);
 			/* Transfer flags */
 			exchange_message_info_dup_to ((CamelMessageInfoBase *) real, (CamelMessageInfoBase *) info);
@@ -356,7 +356,7 @@ exchange_entry_play_transfer (CamelOfflineJournal *journal, CamelExchangeJournal
 
 		g_ptr_array_free (xuids, TRUE);
 		g_ptr_array_free (uids, TRUE);
-		/* camel_object_unref (src); FIXME: should we? */
+		/* g_object_unref (src); FIXME: should we? */
 	}
 	else {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Folder doesn't exist"));
@@ -441,12 +441,12 @@ update_cache (CamelExchangeJournal *exchange_journal, CamelMimeMessage *message,
 				      g_strerror (errno));
 		camel_data_cache_remove (exchange_folder->cache, "cache", uid, NULL);
 		folder->summary->nextuid--;
-		camel_object_unref (cache);
+		g_object_unref (cache);
 		g_free (uid);
 		return FALSE;
 	}
 
-	camel_object_unref (cache);
+	g_object_unref (cache);
 
 	info = camel_folder_summary_info_new_from_message (folder->summary, message, NULL);
 	info->uid = camel_pstring_strdup (uid);
diff --git a/camel/camel-exchange-store.c b/camel/camel-exchange-store.c
index 3bcdc6d..47d1b76 100644
--- a/camel/camel-exchange-store.c
+++ b/camel/camel-exchange-store.c
@@ -456,7 +456,7 @@ exchange_get_folder (CamelStore *store, const gchar *folder_name,
 		}
 		g_mutex_unlock (exch->folders_lock);
 		g_free (folder_dir);
-		camel_object_unref (CAMEL_OBJECT (folder));
+		g_object_unref (CAMEL_OBJECT (folder));
 		return NULL;
 	}
 	g_free (folder_dir);
@@ -792,7 +792,7 @@ exchange_rename_folder (CamelStore *store, const gchar *old_name,
 	folder = g_hash_table_lookup (exch->folders, reninfo.old_base);
 	if (folder) {
 		g_hash_table_remove (exch->folders, reninfo.old_base);
-		camel_object_unref (CAMEL_OBJECT (folder));
+		g_object_unref (CAMEL_OBJECT (folder));
 	}
 	g_mutex_unlock (exch->folders_lock);
 
@@ -844,7 +844,7 @@ camel_exchange_store_folder_deleted (CamelExchangeStore *estore, const gchar *na
 	folder = g_hash_table_lookup (estore->folders, info->full_name);
 	if (folder) {
 		g_hash_table_remove (estore->folders, info->full_name);
-		camel_object_unref (CAMEL_OBJECT (folder));
+		g_object_unref (CAMEL_OBJECT (folder));
 	}
 	g_mutex_unlock (estore->folders_lock);
 
diff --git a/camel/camel-exchange-transport.c b/camel/camel-exchange-transport.c
index 5b8a84c..92ffbb0 100644
--- a/camel/camel-exchange-transport.c
+++ b/camel/camel-exchange-transport.c
@@ -129,7 +129,7 @@ exchange_send_to (CamelTransport *transport, CamelMimeMessage *message,
 	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);
 	filtered_stream = camel_stream_filter_new_with_stream (stream);
 	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlffilter));
-	camel_object_unref (CAMEL_OBJECT (crlffilter));
+	g_object_unref (CAMEL_OBJECT (crlffilter));
 
 	/* Gross hack copied from camel-smtp-transport. ugh. FIXME */
 	/* copy and remove the bcc headers */
@@ -145,7 +145,7 @@ exchange_send_to (CamelTransport *transport, CamelMimeMessage *message,
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),
 					    CAMEL_STREAM (filtered_stream));
 	camel_stream_flush (CAMEL_STREAM (filtered_stream));
-	camel_object_unref (CAMEL_OBJECT (filtered_stream));
+	g_object_unref (CAMEL_OBJECT (filtered_stream));
 
 	/* add the bcc headers back */
 	if (bcc) {
@@ -161,9 +161,9 @@ exchange_send_to (CamelTransport *transport, CamelMimeMessage *message,
 	success = camel_exchange_utils_send_message (CAMEL_SERVICE (transport), addr, recipients_array, CAMEL_STREAM_MEM (stream)->buffer, ex);
 
 	g_ptr_array_free (recipients_array, TRUE);
-	camel_object_unref (CAMEL_OBJECT (stream));
+	g_object_unref (CAMEL_OBJECT (stream));
 
 	if (store)
-		camel_object_unref (CAMEL_OBJECT (store));
+		g_object_unref (CAMEL_OBJECT (store));
 	return success;
 }
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index 5601c01..0a691cd 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -467,13 +467,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			camel_data_wrapper_construct_from_stream (delegate_mail_text, stream);
 			g_free (role_name);
 			g_string_free (role_name_final, TRUE);
-			camel_object_unref (stream);
+			g_object_unref (stream);
 
 			part = camel_mime_part_new ();
 			camel_medium_set_content_object (CAMEL_MEDIUM (part), delegate_mail_text);
-			camel_object_unref (delegate_mail_text);
+			g_object_unref (delegate_mail_text);
 			camel_multipart_add_part (body, part);
-			camel_object_unref (part);
+			g_object_unref (part);
 
 			/* Create the machine-readable receipt */
 			delegate_mail_data = camel_data_wrapper_new ();
@@ -484,15 +484,15 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			part = camel_mime_part_new ();
 
 			camel_data_wrapper_construct_from_stream (delegate_mail_data, stream);
-			camel_object_unref (stream);
+			g_object_unref (stream);
 			camel_medium_set_content_object (CAMEL_MEDIUM (part), delegate_mail_data);
-			camel_object_unref (delegate_mail_data);
+			g_object_unref (delegate_mail_data);
 			camel_multipart_add_part (body, part);
-			camel_object_unref (part);
+			g_object_unref (part);
 
 			/* Finish creating the message */
 			camel_medium_set_content_object (CAMEL_MEDIUM (delegate_mail), CAMEL_DATA_WRAPPER (body));
-			camel_object_unref (body);
+			g_object_unref (body);
 
 			delegate_mail_subject = g_strdup_printf (_("You have been designated "
 						"as a delegate for %s"), exchange_account_get_username (account));
@@ -503,7 +503,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			camel_address_decode (CAMEL_ADDRESS (addr), self_address);
 			camel_mime_message_set_from (delegate_mail, addr);
 			g_free (self_address);
-			camel_object_unref (addr);
+			g_object_unref (addr);
 
 			delegate_exchange_dn = e2k_entryid_to_dn (user->entryid);
 			recipient_address = email_look_up (delegate_exchange_dn,account);
@@ -512,7 +512,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 				addr = camel_internet_address_new ();
 				camel_address_decode (CAMEL_ADDRESS (addr), recipient_address);
 				camel_mime_message_set_recipients (delegate_mail, CAMEL_RECIPIENT_TYPE_TO, addr);
-				camel_object_unref (addr);
+				g_object_unref (addr);
 			}
 
 			eaccount = exchange_account_fetch (account);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]