Camel is now GObject-based.

13 files changed, 56 insertions, 56 deletions

diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 9c4ca2ca0d..68a1a241dc 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -74,7 +74,7 @@ org_gnome_audio_inline_pobject_free (EMFormatHTMLPObject *o)
 	}
 
 	if (po->part) {
-		camel_object_unref (po->part);
+		g_object_unref (po->part);
 		po->part = NULL;
 	}
 	if (po->filename) {
@@ -204,7 +204,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob
 		data = camel_medium_get_content (CAMEL_MEDIUM (po->part));
 		camel_data_wrapper_decode_to_stream (data, stream);
 		camel_stream_flush (stream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 
 		d(printf ("audio inline formatter: init gst playbin\n"));
 
@@ -293,7 +293,7 @@ org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t)
 
 	pobj = (struct _org_gnome_audio_inline_pobject *) em_format_html_add_pobject ((EMFormatHTML *) t->format, sizeof(*pobj), classid,
 										      t->part, org_gnome_audio_inline_button_panel);
-	camel_object_ref (t->part);
+	g_object_ref (t->part);
 	pobj->part = t->part;
 	pobj->filename = NULL;
 	pobj->playbin = NULL;
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index a3e72c975e..04a01cbdd5 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -94,10 +94,10 @@ init_db (void)
 
 	camel_mime_parser_init_with_stream (parser, stream);
 	camel_mime_parser_scan_from (parser, FALSE);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser);
-	camel_object_unref (parser);
+	g_object_unref (parser);
 
 	d(fprintf (stderr, "Initing the bogofilter DB with Welcome message\n"));
 
@@ -106,7 +106,7 @@ init_db (void)
 	}
 
 	pipe_to_bogofilter (msg, argv, NULL);
-	camel_object_unref (msg);
+	g_object_unref (msg);
 
 }
 
@@ -166,7 +166,7 @@ retry:
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream);
 	camel_stream_flush (stream);
 	camel_stream_close (stream);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 #ifndef G_OS_WIN32
 	waitres = waitpid (child_pid, &status, 0);
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index c3be10312c..d2addbf095 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -130,7 +130,7 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 				}
 
 				em_folder_tree_model_add_store (model, store, account->name);
-				camel_object_unref (store);
+				g_object_unref (store);
 			}
 		}
 
@@ -145,7 +145,7 @@ accept_free(gpointer data)
 {
 	struct AcceptData *accept_data = data;
 
-	camel_object_unref(accept_data->msg);
+	g_object_unref (accept_data->msg);
 	g_free(accept_data);
 }
 
@@ -169,7 +169,7 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg)
 	em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri);
 	g_free(uri);
 	accept_data->msg = msg;
-	camel_object_ref(msg);
+	g_object_ref (msg);
 	accept_data->model = EM_FOLDER_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (folder_tree)));
 	g_object_set_data_full((GObject *)dialog, "accept-data", accept_data, accept_free);
 	g_signal_connect (dialog, "response", G_CALLBACK (install_folder_response), accept_data);
@@ -235,8 +235,8 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 			gtk_window_set_title (GTK_WINDOW (assistant), _("Shared Folder Installation"));
 			gtk_window_set_position (GTK_WINDOW (assistant) , GTK_WIN_POS_CENTER_ALWAYS);
 
-			camel_object_ref (msg);
-			g_object_set_data_full((GObject *)page, "msg", msg, camel_object_unref);
+			g_object_ref (msg);
+			g_object_set_data_full((GObject *)page, "msg", msg, g_object_unref);
 
 			g_signal_connect (assistant, "apply", G_CALLBACK (apply_clicked), msg);
 
@@ -246,7 +246,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 		} else
 			g_warning ("Could not get the sender name");
 
-		camel_object_unref (stream);
+		g_object_unref (stream);
 	}
 }
 
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 2d97684a03..1507e08af0 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -716,7 +716,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		}
 	}
 
-	camel_object_unref (store);
+	g_object_unref (store);
 	camel_exception_clear (&ex);
 	return NULL;
 }
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index e7775b216a..10e9b341dc 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -86,7 +86,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 	em_folder_tree_model_add_store (model, store, account->name);
-	/* camel_object_unref (store); */
+	/* g_object_unref (store); */
 }
 
 void
@@ -171,7 +171,7 @@ static void
 create_folder_free (struct _EMCreateFolder *m)
 {
 	camel_store_free_folder_info (m->store, m->fi);
-	camel_object_unref (m->store);
+	g_object_unref (m->store);
 	g_free (m->full_name);
 	g_free (m->parent);
 	g_free (m->name);
@@ -217,7 +217,7 @@ create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct
 	}
 
 	m = mail_msg_new (&create_folder_info);
-	camel_object_ref (store);
+	g_object_ref (store);
 	m->store = store;
 	m->full_name = g_strdup (full_name);
 	m->parent = g_strdup (parent);
@@ -259,7 +259,7 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 
 	if (!(si = em_folder_tree_model_lookup_store_info (ssi->model, store))) {
 		g_assert_not_reached ();
-		camel_object_unref (store);
+		g_object_unref (store);
 		return;
 	}
 
@@ -279,7 +279,7 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi)
 		create_folder (si->store, path, new_folder_created_cb, ssi);
 
 	}
-	camel_object_unref (store);
+	g_object_unref (store);
 }
 
 static void
@@ -325,7 +325,7 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m
 	gtk_widget_show(users_dialog);
 	g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi);
 
-	camel_object_unref (store);
+	g_object_unref (store);
 	return;
 
 }
diff --git a/plugins/image-inline/image-inline.c b/plugins/image-inline/image-inline.c
index 861aaacfef..21688dbf94 100644
--- a/plugins/image-inline/image-inline.c
+++ b/plugins/image-inline/image-inline.c
@@ -309,7 +309,7 @@ org_gnome_image_inline_pobject_free (EMFormatHTMLPObject *object)
 	image_object = (ImageInlinePObject *) object;
 
 	if (image_object->mime_part != NULL) {
-		camel_object_unref (image_object->mime_part);
+		g_object_unref (image_object->mime_part);
 		image_object->mime_part = NULL;
 	}
 
@@ -389,7 +389,7 @@ org_gnome_image_inline_decode (ImageInlinePObject *image_object)
 	}
 
 exit:
-	camel_object_unref (stream);
+	g_object_unref (stream);
 	g_object_unref (loader);
 }
 
@@ -458,7 +458,7 @@ org_gnome_image_inline_format (gpointer ep, EMFormatHookTarget *target)
 			classid, target->part,
 			org_gnome_image_inline_embed);
 
-	camel_object_ref (target->part);
+	g_object_ref (target->part);
 	image_object->mime_part = target->part;
 
 	image_object->object.free = org_gnome_image_inline_pobject_free;
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 6a85f94ead..4c93d294c9 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2562,7 +2562,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 		puri->vcalendar = g_strndup (
 			(gchar *) byte_array->data, byte_array->len);
 
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>");
 	camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid);
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index cebf779ee6..f2e3f98435 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -205,7 +205,7 @@ set_description (ECalComponent *comp, CamelMimeMessage *message)
 	stream = camel_stream_mem_new_with_byte_array (byte_array);
 	camel_data_wrapper_decode_to_stream (content, stream);
 	str = g_strndup ((gchar *) byte_array->data, byte_array->len);
-	camel_object_unref (stream);
+	g_object_unref (stream);
 
 	/* convert to UTF-8 string */
 	if (str && content->mime_type->params && content->mime_type->params->value) {
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 0af8fc43ef..84706b783e 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -668,7 +668,7 @@ pst_process_folder (PstImporter *m, pst_item *item)
 	m->folder_uri = uri;
 
 	if (m->folder) {
-		camel_object_unref (m->folder);
+		g_object_unref (m->folder);
 		m->folder = NULL;
 	}
 
@@ -705,7 +705,7 @@ pst_create_folder (PstImporter *m)
 			*pos = '\0';
 
 			folder = mail_tool_uri_to_folder (dest, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
-			camel_object_unref(folder);
+			g_object_unref (folder);
 			*pos = '/';
 		}
 	}
@@ -713,7 +713,7 @@ pst_create_folder (PstImporter *m)
 	g_free (dest);
 
 	if (m->folder) {
-		camel_object_unref (m->folder);
+		g_object_unref (m->folder);
 	}
 
 	m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
@@ -805,7 +805,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 	}
 
 	camel_mime_message_set_from (msg, addr);
-	camel_object_unref (addr);
+	g_object_unref (addr);
 
 	if (item->email->sent_date != NULL) {
 		camel_mime_message_set_date (msg, pst_fileTimeToUnixTime (item->email->sent_date), 0);
@@ -833,7 +833,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address.str) > 0)
 				camel_mime_message_set_recipients (msg, "To", addr);
 
-			camel_object_unref (addr);
+			g_object_unref (addr);
 		}
 
 		if (item->email->cc_address.str != NULL) {
@@ -842,7 +842,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 			if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address.str) > 0)
 				camel_mime_message_set_recipients (msg, "CC", addr);
 
-			camel_object_unref (addr);
+			g_object_unref (addr);
 		}
 	}
 
@@ -873,7 +873,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 		part = camel_mime_part_new ();
 		camel_mime_part_set_content (part, item->body.str, strlen (item->body.str), "text/plain");
 		camel_multipart_add_part (mp, part);
-		camel_object_unref (part);
+		g_object_unref (part);
 	}
 
 	if (item->email->htmlbody.str != NULL) {
@@ -881,14 +881,14 @@ pst_process_email (PstImporter *m, pst_item *item)
 		part = camel_mime_part_new ();
 		camel_mime_part_set_content (part, item->email->htmlbody.str, strlen (item->email->htmlbody.str), "text/html");
 		camel_multipart_add_part (mp, part);
-		camel_object_unref (part);
+		g_object_unref (part);
 	}
 
 	for (attach = item->attach; attach; attach = attach->next) {
 		if (attach->data.data || attach->i_id) {
 			part = attachment_to_part(m, attach);
 			camel_multipart_add_part (mp, part);
-			camel_object_unref (part);
+			g_object_unref (part);
 		}
 	}
 
@@ -918,7 +918,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 
 	camel_folder_append_message (m->folder, msg, info, NULL, &m->ex);
 	camel_message_info_free (info);
-	camel_object_unref (msg);
+	g_object_unref (msg);
 
 	camel_folder_sync (m->folder, FALSE, NULL);
 	camel_folder_thaw (m->folder);
@@ -1244,18 +1244,18 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 			|| camel_stream_flush (stream) == -1)
 		{
 			g_warning ("Could not write attachment to %s: %s", path, g_strerror (errno));
-			camel_object_unref (stream);
+			g_object_unref (stream);
 			attach = attach->next;
 			continue;
 		}
 
-		camel_object_unref (stream);
+		g_object_unref (stream);
 
 		uri = g_filename_to_uri (path, NULL, NULL);
 		list = g_slist_append (list, g_strdup (uri));
 		g_free (uri);
 
-		camel_object_unref (part);
+		g_object_unref (part);
 		g_free (path);
 
 		attach = attach->next;
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 7db6b6813d..dbcd501d75 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -188,7 +188,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin
 		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream);
 		camel_stream_flush (stream);
 		camel_stream_close (stream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 	} else if (in) {
 		camel_write (fds[1], in, strlen (in));
 		close (fds[1]);
@@ -203,7 +203,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin
 		camel_stream_mem_set_byte_array (memstream, output_buffer);
 
 		camel_stream_write_to_stream (stream, (CamelStream *) memstream);
-		camel_object_unref (stream);
+		g_object_unref (stream);
 		g_byte_array_append (output_buffer, (guchar *)"", 1);
 
 		d(printf ("child process output: %s len: %d\n", output_buffer->data, output_buffer->len));
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 7971ea3b72..97281246b5 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -486,7 +486,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes
 	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (template), mem);
 	camel_stream_reset (mem);
 	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (new), mem);
-	camel_object_unref (mem);
+	g_object_unref (mem);
 
 	/* Add the headers from the message we are replying to, so CC and that
 	 * stuff is preserved. */
@@ -514,7 +514,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes
 	/* Create the composer */
 	em_utils_edit_message (new, folder);
 
-	camel_object_unref(new);
+	g_object_unref (new);
 }
 
 static void
@@ -605,7 +605,7 @@ build_template_menus_recurse (GtkUIManager *ui_manager,
 				continue;
 
 			template = camel_folder_get_message (folder, uid, NULL);
-			camel_object_ref (template);
+			g_object_ref (template);
 
 			action_label =
 				camel_mime_message_get_subject (template);
@@ -620,7 +620,7 @@ build_template_menus_recurse (GtkUIManager *ui_manager,
 				action_name, action_label, NULL, NULL);
 
 			muid = camel_pstring_strdup (message_uid);
-			camel_object_ref (message_folder);
+			g_object_ref (message_folder);
 
 			g_object_set_data_full (
 				G_OBJECT (action), "message_uid", (gpointer) muid,
@@ -628,11 +628,11 @@ build_template_menus_recurse (GtkUIManager *ui_manager,
 
 			g_object_set_data_full (
 				G_OBJECT (action), "message_folder", message_folder,
-				(GDestroyNotify) camel_object_unref);
+				(GDestroyNotify) g_object_unref);
 
 			g_object_set_data_full (
 				G_OBJECT (action), "template", template,
-				(GDestroyNotify) camel_object_unref);
+				(GDestroyNotify) g_object_unref);
 
 			g_signal_connect (
 				action, "activate",
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index f75fcf051b..8bb5341998 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -94,10 +94,10 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 		goto fail;
 	if (camel_data_wrapper_decode_to_stream(content, out) == -1
 	    || camel_stream_close(out) == -1) {
-		camel_object_unref(out);
+		g_object_unref (out);
 		goto fail;
 	}
-	camel_object_unref(out);
+	g_object_unref (out);
 
 	/* Extracting the winmail.dat */
         TNEFInitialize(&tnef);
@@ -139,13 +139,13 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 		stream = camel_stream_fs_new_with_name(path, O_RDONLY, 0);
 		content = camel_data_wrapper_new();
 		camel_data_wrapper_construct_from_stream(content, stream);
-		camel_object_unref(stream);
+		g_object_unref (stream);
 
 		part = camel_mime_part_new();
 		camel_mime_part_set_encoding(part, CAMEL_TRANSFER_ENCODING_BINARY);
 
 		camel_medium_set_content ((CamelMedium *)part, content);
-		camel_object_unref(content);
+		g_object_unref (content);
 
 		type = em_format_snoop_type(part);
 		if (type)
@@ -156,7 +156,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 		g_free(path);
 
 		camel_multipart_add_part(mp, part);
-		camel_object_unref(part);
+		g_object_unref (part);
 	}
 
 	closedir(dir);
@@ -171,8 +171,8 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 
 	g_string_truncate(t->format->part_id, len);
 
-	camel_object_unref(mp);
-	camel_object_unref(mainpart);
+	g_object_unref (mp);
+	g_object_unref (mainpart);
 
 	goto ok;
  fail:
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 3cd3f93c8c..228d64ba2c 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -101,8 +101,8 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
 	contact_list = eab_contact_list_from_string (string);
 	vcard_object->contact_list = contact_list;
 
-	camel_object_unref (mime_part);
-	camel_object_unref (stream);
+	g_object_unref (mime_part);
+	g_object_unref (stream);
 }
 
 static void
@@ -277,7 +277,7 @@ org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target)
 			classid, target->part,
 			org_gnome_vcard_inline_embed);
 
-	camel_object_ref (target->part);
+	g_object_ref (target->part);
 
 	vcard_object->object.free = org_gnome_vcard_inline_pobject_free;
 	org_gnome_vcard_inline_decode (vcard_object, target->part);