[evolution/camel-gobject: 1/4] Use g_object_[un]ref() instead of camel_object_[un]ref().
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution/camel-gobject: 1/4] Use g_object_[un]ref() instead of camel_object_[un]ref().
- Date: Wed, 18 Nov 2009 00:31:02 +0000 (UTC)
commit c59afd2baf261e4399c4cfab58c981432d69853a
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Oct 9 16:37:23 2009 -0500
Use g_object_[un]ref() instead of camel_object_[un]ref().
calendar/gui/dialogs/comp-editor.c | 2 +-
calendar/gui/itip-utils.c | 4 +-
composer/e-composer-autosave.c | 4 +-
composer/e-composer-header-table.c | 2 +-
composer/e-composer-private.c | 4 +-
composer/e-msg-composer.c | 110 ++++++++--------
e-util/e-signature-utils.c | 22 +--
e-util/e-util.c | 33 +-----
e-util/e-util.h | 6 -
em-format/em-format-quote.c | 19 ++--
em-format/em-format.c | 76 +++++-----
mail/e-mail-local.c | 3 +-
mail/e-mail-reader.c | 4 +-
mail/e-mail-store.c | 17 +--
mail/em-composer-utils.c | 94 ++++++-------
mail/em-config.c | 5 +-
mail/em-event.c | 8 +-
mail/em-folder-properties.c | 5 +-
mail/em-folder-tree-model.c | 25 ++--
mail/em-folder-tree.c | 26 ++--
mail/em-folder-utils.c | 33 ++---
mail/em-format-html-display.c | 4 +-
mail/em-format-html.c | 59 ++++----
mail/em-inline-filter.c | 6 +-
mail/em-subscribe-editor.c | 5 +-
mail/em-sync-stream.c | 4 +-
mail/em-utils.c | 28 ++--
mail/importers/mail-importer.c | 8 +-
mail/mail-folder-cache.c | 29 ++---
mail/mail-ops.c | 160 ++++++++++------------
mail/mail-send-recv.c | 25 ++--
mail/mail-session.c | 10 +-
mail/mail-tools.c | 6 +-
mail/mail-vfolder.c | 23 ++--
mail/message-list.c | 29 ++---
modules/addressbook/eab-composer-util.c | 2 +-
modules/calendar/e-cal-attachment-handler.c | 2 +-
modules/mail/e-mail-attachment-handler.c | 18 ++--
modules/mail/e-mail-shell-migrate.c | 16 +-
modules/mail/e-mail-shell-settings.c | 2 +-
plugins/audio-inline/audio-inline.c | 7 +-
plugins/bogo-junk-plugin/bf-junk-filter.c | 8 +-
plugins/groupwise-features/install-shared.c | 13 +-
plugins/groupwise-features/proxy.c | 2 +-
plugins/groupwise-features/share-folder-common.c | 13 +-
plugins/itip-formatter/itip-formatter.c | 2 +-
plugins/mail-to-task/mail-to-task.c | 2 +-
plugins/pst-import/pst-importer.c | 26 ++--
plugins/sa-junk-plugin/em-junk-filter.c | 4 +-
plugins/templates/templates.c | 10 +-
plugins/tnef-attachments/tnef-plugin.c | 10 +-
plugins/vcard-inline/vcard-inline.c | 6 +-
widgets/misc/e-account-combo-box.c | 2 +-
widgets/misc/e-attachment-view.c | 4 +-
widgets/misc/e-attachment.c | 27 ++--
widgets/misc/e-web-view.c | 4 +-
56 files changed, 484 insertions(+), 594 deletions(-)
---
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 9de8839..9ff5006 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2941,7 +2941,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
attach_list = g_slist_append (attach_list, cal_mime_attach);
- camel_object_unref (mstream);
+ g_object_unref (mstream);
}
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 2f34d33..5bbd4af 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -1192,7 +1192,7 @@ append_cal_attachments (EMsgComposer *composer,
camel_mime_part_set_disposition (
attachment, "attachment");
e_msg_composer_attach (composer, attachment);
- camel_object_unref (attachment);
+ g_object_unref (attachment);
g_free (mime_attach->filename);
g_free (mime_attach->content_type);
@@ -1322,7 +1322,7 @@ itip_send_comp (ECalComponentItipMethod method, ECalComponent *send_comp,
camel_mime_part_set_description (attachment, description);
camel_mime_part_set_disposition (attachment, "inline");
e_msg_composer_attach (composer, attachment);
- camel_object_unref (attachment);
+ g_object_unref (attachment);
g_free (description);
}
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index a4d5343..786b3e6 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -374,8 +374,8 @@ autosave_snapshot_cb (GFile *file,
CAMEL_STREAM_MEM (camel_stream), buffer);
camel_data_wrapper_decode_to_stream (
CAMEL_DATA_WRAPPER (message), camel_stream);
- camel_object_unref (message);
- camel_object_unref (camel_stream);
+ g_object_unref (message);
+ g_object_unref (camel_stream);
/* Load the buffer into a GMemoryInputStream.
* But watch out for zero length MIME parts. */
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index e7972e2..4315297 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -251,7 +251,7 @@ composer_header_table_update_destinations (EDestination **old_destinations,
}
}
- camel_object_unref (inet_address);
+ g_object_unref (inet_address);
skip_auto:
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 1516b15..0cfd8fc 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -132,7 +132,7 @@ e_composer_private_init (EMsgComposer *composer)
priv->inline_images_by_url = g_hash_table_new_full (
g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
- (GDestroyNotify) camel_object_unref);
+ (GDestroyNotify) g_object_unref);
priv->charset = e_composer_get_default_charset ();
@@ -333,7 +333,7 @@ e_composer_private_dispose (EMsgComposer *composer)
g_hash_table_remove_all (composer->priv->inline_images_by_url);
if (composer->priv->redirect != NULL) {
- camel_object_unref (composer->priv->redirect);
+ g_object_unref (composer->priv->redirect);
composer->priv->redirect = NULL;
}
}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index c580a22..d1985d7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -156,7 +156,7 @@ emcu_part_to_html (CamelMimePart *part, gssize *len, EMFormat *source)
g_object_unref(emfq);
camel_stream_write((CamelStream *) mem, "", 1);
- camel_object_unref(mem);
+ g_object_unref(mem);
text = (gchar *)buf->data;
if (len)
@@ -461,9 +461,9 @@ set_recipients_from_destv (CamelMimeMessage *msg,
camel_mime_message_set_recipients (msg, header, bcc_addr);
}
- camel_object_unref (to_addr);
- camel_object_unref (cc_addr);
- camel_object_unref (bcc_addr);
+ g_object_unref (to_addr);
+ g_object_unref (cc_addr);
+ g_object_unref (bcc_addr);
}
static void
@@ -506,7 +506,7 @@ build_message_headers (EMsgComposer *composer,
} else
camel_mime_message_set_from (msg, addr);
- camel_object_unref (addr);
+ g_object_unref (addr);
}
/* Reply-To: */
@@ -519,7 +519,7 @@ build_message_headers (EMsgComposer *composer,
if (camel_address_unformat (CAMEL_ADDRESS (addr), reply_to) > 0)
camel_mime_message_set_reply_to (msg, addr);
- camel_object_unref (addr);
+ g_object_unref (addr);
}
/* To:, Cc:, Bcc: */
@@ -603,8 +603,7 @@ build_message (EMsgComposer *composer,
/* evil kludgy hack for Redirect */
if (p->redirect) {
build_message_headers (composer, p->redirect, TRUE);
- camel_object_ref (p->redirect);
- return p->redirect;
+ return g_object_ref (p->redirect);
}
new = camel_mime_message_new ();
@@ -675,12 +674,12 @@ build_message (EMsgComposer *composer,
CamelMimeFilterCharset *filter;
filter_stream = camel_stream_filter_new_with_stream (stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
stream = (CamelStream *) filter_stream;
filter = camel_mime_filter_charset_new_convert ("UTF-8", iconv_charset);
camel_stream_filter_add (filter_stream, (CamelMimeFilter *) filter);
- camel_object_unref (filter);
+ g_object_unref (filter);
}
if (plain_encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE) {
@@ -708,7 +707,7 @@ build_message (EMsgComposer *composer,
/* construct the content object */
plain = camel_data_wrapper_new ();
camel_data_wrapper_construct_from_stream (plain, stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
if (plain_encoding == CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE) {
/* to not re-encode the data when pushing it to a part */
@@ -764,7 +763,7 @@ build_message (EMsgComposer *composer,
}
camel_data_wrapper_construct_from_stream (html, stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
camel_data_wrapper_set_mime_type (html, "text/html; charset=utf-8");
if (pre_encode) {
@@ -780,17 +779,17 @@ build_message (EMsgComposer *composer,
part = camel_mime_part_new ();
camel_medium_set_content_object (CAMEL_MEDIUM (part), plain);
- camel_object_unref (plain);
+ g_object_unref (plain);
camel_mime_part_set_encoding (part, plain_encoding);
camel_multipart_add_part (body, part);
- camel_object_unref (part);
+ g_object_unref (part);
part = camel_mime_part_new ();
camel_medium_set_content_object (CAMEL_MEDIUM (part), html);
- camel_object_unref (html);
+ g_object_unref (html);
camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE);
camel_multipart_add_part (body, part);
- camel_object_unref (part);
+ g_object_unref (part);
/* If there are inlined images, construct a
* multipart/related containing the
@@ -807,9 +806,9 @@ build_message (EMsgComposer *composer,
part = camel_mime_part_new ();
camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (body));
- camel_object_unref (body);
+ g_object_unref (body);
camel_multipart_add_part (html_with_images, part);
- camel_object_unref (part);
+ g_object_unref (part);
add_inlined_images (composer, html_with_images);
clear_current_images (composer);
@@ -835,9 +834,9 @@ build_message (EMsgComposer *composer,
camel_medium_set_content_object (CAMEL_MEDIUM (part), current);
if (current == plain)
camel_mime_part_set_encoding (part, plain_encoding);
- camel_object_unref (current);
+ g_object_unref (current);
camel_multipart_add_part (multipart, part);
- camel_object_unref (part);
+ g_object_unref (part);
e_attachment_store_add_to_multipart (
store, multipart, p->charset);
@@ -898,7 +897,7 @@ build_message (EMsgComposer *composer,
camel_medium_set_content_object (CAMEL_MEDIUM (part), current);
if (current == plain)
camel_mime_part_set_encoding (part, plain_encoding);
- camel_object_unref (current);
+ g_object_unref (current);
account = e_composer_header_table_get_account (table);
@@ -920,14 +919,14 @@ build_message (EMsgComposer *composer,
camel_cipher_sign (
cipher, pgp_userid, CAMEL_CIPHER_HASH_SHA1,
part, npart, &ex);
- camel_object_unref (cipher);
+ g_object_unref (cipher);
if (camel_exception_is_set (&ex)) {
- camel_object_unref (npart);
+ g_object_unref (npart);
goto exception;
}
- camel_object_unref (part);
+ g_object_unref (part);
part = npart;
}
@@ -946,26 +945,26 @@ build_message (EMsgComposer *composer,
camel_cipher_encrypt (
cipher, pgp_userid, recipients,
part, npart, &ex);
- camel_object_unref (cipher);
+ g_object_unref (cipher);
if (account && account->pgp_encrypt_to_self && pgp_userid)
g_ptr_array_set_size (recipients, recipients->len - 1);
if (camel_exception_is_set (&ex)) {
- camel_object_unref (npart);
+ g_object_unref (npart);
goto exception;
}
- camel_object_unref (part);
+ g_object_unref (part);
part = npart;
}
if (from)
- camel_object_unref (from);
+ g_object_unref (from);
current = camel_medium_get_content_object (CAMEL_MEDIUM (part));
- camel_object_ref (current);
- camel_object_unref (part);
+ g_object_ref (current);
+ g_object_unref (part);
}
#if defined (HAVE_NSS)
@@ -977,7 +976,7 @@ build_message (EMsgComposer *composer,
camel_medium_set_content_object ((CamelMedium *)part, current);
if (current == plain)
camel_mime_part_set_encoding (part, plain_encoding);
- camel_object_unref (current);
+ g_object_unref (current);
if (smime_sign
&& (account == NULL || account->smime_sign_key == NULL || account->smime_sign_key[0] == 0)) {
@@ -1007,14 +1006,14 @@ build_message (EMsgComposer *composer,
}
camel_cipher_sign (cipher, account->smime_sign_key, CAMEL_CIPHER_HASH_SHA1, part, npart, &ex);
- camel_object_unref (cipher);
+ g_object_unref (cipher);
if (camel_exception_is_set (&ex)) {
- camel_object_unref (npart);
+ g_object_unref (npart);
goto exception;
}
- camel_object_unref (part);
+ g_object_unref (part);
part = npart;
}
@@ -1028,7 +1027,7 @@ build_message (EMsgComposer *composer,
camel_smime_context_set_encrypt_key ((CamelSMIMEContext *)cipher, TRUE, account->smime_encrypt_key);
camel_cipher_encrypt (cipher, NULL, recipients, part, (CamelMimePart *)new, &ex);
- camel_object_unref (cipher);
+ g_object_unref (cipher);
if (camel_exception_is_set (&ex))
goto exception;
@@ -1038,16 +1037,16 @@ build_message (EMsgComposer *composer,
}
if (from)
- camel_object_unref (from);
+ g_object_unref (from);
/* we replaced the message directly, we don't want to do reparenting foo */
if (smime_encrypt) {
- camel_object_unref (part);
+ g_object_unref (part);
goto skip_content;
} else {
current = camel_medium_get_content_object ((CamelMedium *)part);
- camel_object_ref (current);
- camel_object_unref (part);
+ g_object_ref (current);
+ g_object_unref (part);
}
}
#endif /* HAVE_NSS */
@@ -1055,7 +1054,7 @@ build_message (EMsgComposer *composer,
camel_medium_set_content_object (CAMEL_MEDIUM (new), current);
if (current == plain)
camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);
- camel_object_unref (current);
+ g_object_unref (current);
#if defined (HAVE_NSS)
skip_content:
@@ -1076,9 +1075,9 @@ skip_content:
exception:
if (part != CAMEL_MIME_PART (new))
- camel_object_unref (part);
+ g_object_unref (part);
- camel_object_unref (new);
+ g_object_unref (new);
if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) {
e_error_run ((GtkWindow *)composer, "mail-composer:no-build-message",
@@ -1403,7 +1402,7 @@ autosave_load_draft (const gchar *filename)
msg = camel_mime_message_new ();
camel_data_wrapper_construct_from_stream (
CAMEL_DATA_WRAPPER (msg), stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
composer = e_msg_composer_new_with_message (msg);
if (composer) {
@@ -2069,7 +2068,7 @@ msg_composer_uri_requested (GtkhtmlEditor *editor,
gtkhtml_editor_get_html (editor), stream,
(gchar *) array->data, array->len);
- camel_object_unref (camel_stream);
+ g_object_unref (camel_stream);
gtk_html_end (html, stream, GTK_HTML_STREAM_OK);
@@ -2535,7 +2534,7 @@ handle_multipart_encrypted (EMsgComposer *composer,
cipher = camel_gpg_context_new (session);
mime_part = camel_mime_part_new ();
valid = camel_cipher_decrypt (cipher, multipart, mime_part, &ex);
- camel_object_unref (cipher);
+ g_object_unref (cipher);
camel_exception_clear (&ex);
if (valid == NULL)
return;
@@ -2576,7 +2575,7 @@ handle_multipart_encrypted (EMsgComposer *composer,
e_msg_composer_attach (composer, mime_part);
}
- camel_object_unref (mime_part);
+ g_object_unref (mime_part);
}
static void
@@ -2818,7 +2817,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
g_hash_table_insert (auto_cc, g_strdup (addr), GINT_TO_POINTER (TRUE));
}
}
- camel_object_unref (iaddr);
+ g_object_unref (iaddr);
}
if (account->always_bcc) {
@@ -2833,7 +2832,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
g_hash_table_insert (auto_bcc, g_strdup (addr), GINT_TO_POINTER (TRUE));
}
}
- camel_object_unref (iaddr);
+ g_object_unref (iaddr);
}
}
@@ -3074,8 +3073,7 @@ e_msg_composer_new_redirect (CamelMimeMessage *message,
subject = camel_mime_message_get_subject (message);
- composer->priv->redirect = message;
- camel_object_ref (message);
+ composer->priv->redirect = g_object_ref (message);
e_composer_header_table_set_account_name (table, resent_from);
e_composer_header_table_set_subject (table, subject);
@@ -3562,7 +3560,7 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
wrapper = camel_data_wrapper_new ();
camel_data_wrapper_construct_from_stream (wrapper, stream);
- camel_object_unref (CAMEL_OBJECT (stream));
+ g_object_unref (CAMEL_OBJECT (stream));
mime_type = e_util_guess_mime_type (dec_file_name, TRUE);
if (mime_type == NULL)
@@ -3572,7 +3570,7 @@ e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,
part = camel_mime_part_new ();
camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
- camel_object_unref (wrapper);
+ g_object_unref (wrapper);
cid = camel_header_msgid_generate ();
camel_mime_part_set_content_id (part, cid);
@@ -3617,7 +3615,7 @@ e_msg_composer_add_inline_image_from_mime_part (EMsgComposer *composer,
url = g_strdup_printf ("cid:%s", cid);
g_hash_table_insert (p->inline_images, url, part);
- camel_object_ref (part);
+ g_object_ref (part);
location = camel_mime_part_get_content_location (part);
if (location != NULL)
@@ -3718,7 +3716,7 @@ e_msg_composer_get_message_print (EMsgComposer *composer,
return NULL;
temp_composer = e_msg_composer_new_with_message (msg);
- camel_object_unref (msg);
+ g_object_unref (msg);
/* Override composer flags. */
flags = msg_composer_get_message_print_helper (
@@ -3919,7 +3917,7 @@ e_msg_composer_get_reply_to (EMsgComposer *composer)
address = camel_internet_address_new ();
if (camel_address_unformat (CAMEL_ADDRESS (address), reply_to) == -1) {
- camel_object_unref (CAMEL_OBJECT (address));
+ g_object_unref (CAMEL_OBJECT (address));
return NULL;
}
@@ -3989,7 +3987,7 @@ e_msg_composer_load_from_file (const gchar *filename)
msg = camel_mime_message_new ();
camel_data_wrapper_construct_from_stream (
CAMEL_DATA_WRAPPER (msg), stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
composer = e_msg_composer_new_with_message (msg);
if (composer != NULL)
diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c
index 4ae5ac2..9efc61b 100644
--- a/e-util/e-signature-utils.c
+++ b/e-util/e-signature-utils.c
@@ -22,12 +22,7 @@
#include <errno.h>
#include <glib/gstdio.h>
#include <gconf/gconf-client.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-tohtml.h>
+#include <camel.h>
#ifndef G_OS_WIN32
#include <sys/wait.h>
@@ -180,9 +175,8 @@ e_read_signature_file (ESignature *signature,
CamelMimeFilter *filter;
gint32 flags;
- filtered_stream =
- camel_stream_filter_new_with_stream (input_stream);
- camel_object_unref (input_stream);
+ filtered_stream = camel_stream_filter_new (input_stream);
+ g_object_unref (input_stream);
flags =
CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT |
@@ -191,7 +185,7 @@ e_read_signature_file (ESignature *signature,
CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
filter = camel_mime_filter_tohtml_new (flags, 0);
camel_stream_filter_add (filtered_stream, filter);
- camel_object_unref (filter);
+ g_object_unref (filter);
input_stream = (CamelStream *) filtered_stream;
}
@@ -201,8 +195,8 @@ e_read_signature_file (ESignature *signature,
camel_stream_mem_set_byte_array (
CAMEL_STREAM_MEM (output_stream), buffer);
camel_stream_write_to_stream (input_stream, output_stream);
- camel_object_unref (output_stream);
- camel_object_unref (input_stream);
+ g_object_unref (output_stream);
+ g_object_unref (input_stream);
/* Make sure the buffer is nul-terminated. */
length = (gsize) buffer->len;
@@ -295,9 +289,9 @@ e_run_signature_script (const gchar *filename)
input_stream = camel_stream_fs_new_with_fd (in_fds[0]);
camel_stream_write_to_stream (input_stream, output_stream);
- camel_object_unref (input_stream);
+ g_object_unref (input_stream);
- camel_object_unref (output_stream);
+ g_object_unref (output_stream);
/* Make sure the buffer is nul-terminated. */
length = (gsize) buffer->len;
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 8009745..cbb9963 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -39,12 +39,11 @@
#include <glib/gi18n.h>
#include <glib/gstdio.h>
-#include <camel/camel-url.h>
-
#ifdef G_OS_WIN32
#include <windows.h>
#endif
+#include <camel/camel.h>
#include <libedataserver/e-data-server-util.h>
#include <libedataserver/e-categories.h>
#include <libedataserver/e-source-list.h>
@@ -1542,33 +1541,3 @@ e_util_set_source_combo_box_list (GtkWidget *source_combo_box, const gchar *sour
g_object_unref (source_list);
g_object_unref (gconf_client);
}
-
-static gpointer
-e_camel_object_copy (gpointer camel_object)
-{
- if (CAMEL_IS_OBJECT (camel_object))
- camel_object_ref (camel_object);
-
- return camel_object;
-}
-
-static void
-e_camel_object_free (gpointer camel_object)
-{
- if (CAMEL_IS_OBJECT (camel_object))
- camel_object_unref (camel_object);
-}
-
-GType
-e_camel_object_get_type (void)
-{
- static GType type = 0;
-
- if (G_UNLIKELY (type == 0))
- type = g_boxed_type_register_static (
- "ECamelObject",
- (GBoxedCopyFunc) e_camel_object_copy,
- (GBoxedFreeFunc) e_camel_object_free);
-
- return type;
-}
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 7c4be25..fbf257b 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -32,7 +32,6 @@
#include <gtk/gtk.h>
#include <limits.h>
#include <gconf/gconf-client.h>
-#include <camel/camel-object.h>
#include <cairo.h>
#include <e-util/e-marshal.h>
@@ -154,11 +153,6 @@ GSList * e_util_get_category_filter_options
void e_util_set_source_combo_box_list(GtkWidget *source_combo_box,
const gchar *source_gconf_path);
-/* Camel uses its own object system, so we have to box
- * CamelObjects to safely use them as GObject properties. */
-#define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ())
-GType e_camel_object_get_type (void);
-
G_END_DECLS
#endif /* E_UTIL_H */
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index 1da4fbe..a82d254 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -72,7 +72,7 @@ emfq_finalize (GObject *object)
EMFormatQuote *emfq =(EMFormatQuote *) object;
if (emfq->stream)
- camel_object_unref(emfq->stream);
+ g_object_unref(emfq->stream);
g_free(emfq->credits);
/* Chain up to parent's finalize() method. */
@@ -140,8 +140,7 @@ em_format_quote_new (const gchar *credits,
emfq = g_object_new (EM_TYPE_FORMAT_QUOTE, NULL);
emfq->credits = g_strdup (credits);
- emfq->stream = stream;
- camel_object_ref (stream);
+ emfq->stream = g_object_ref (stream);
emfq->flags = flags;
return emfq;
@@ -451,10 +450,10 @@ emfq_format_source(EMFormat *emf, CamelStream *stream, CamelMimePart *part)
| CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES
| CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT, 0);
camel_stream_filter_add(filtered_stream, html_filter);
- camel_object_unref(html_filter);
+ g_object_unref(html_filter);
em_format_format_text(emf, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
- camel_object_unref(filtered_stream);
+ g_object_unref(filtered_stream);
}
static void
@@ -512,7 +511,7 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E
if ((emfq->flags & EM_FORMAT_QUOTE_KEEP_SIG) == 0) {
sig_strip = em_stripsig_filter_new ();
camel_stream_filter_add (filtered_stream, sig_strip);
- camel_object_unref (sig_strip);
+ g_object_unref (sig_strip);
}
wrap_filter = camel_mime_filter_linewrap_new (70, 70, 0, CAMEL_MIME_FILTER_LINEWRAP_WORD);
@@ -521,11 +520,11 @@ emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, E
html_filter = camel_mime_filter_tohtml_new(flags, rgb);
camel_stream_filter_add(filtered_stream, html_filter);
- camel_object_unref(html_filter);
+ g_object_unref(html_filter);
em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
camel_stream_flush((CamelStream *)filtered_stream);
- camel_object_unref(filtered_stream);
+ g_object_unref(filtered_stream);
}
static void
@@ -548,11 +547,11 @@ emfq_text_enriched(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part
enriched = camel_mime_filter_enriched_new(flags);
filtered_stream = camel_stream_filter_new_with_stream (stream);
camel_stream_filter_add(filtered_stream, enriched);
- camel_object_unref(enriched);
+ g_object_unref(enriched);
camel_stream_write_string(stream, "<br><hr><br>");
em_format_format_text((EMFormat *)emfq, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
- camel_object_unref(filtered_stream);
+ g_object_unref(filtered_stream);
}
static void
diff --git a/em-format/em-format.c b/em-format/em-format.c
index d3ab13b..3520252 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -93,7 +93,7 @@ emf_free_cache(struct _EMFormatCache *efc)
if (efc->valid)
camel_cipher_validity_free(efc->valid);
if (efc->secured)
- camel_object_unref(efc->secured);
+ g_object_unref(efc->secured);
g_free(efc);
}
@@ -115,7 +115,7 @@ emf_finalize (GObject *object)
EMFormat *emf = EM_FORMAT (object);
if (emf->session)
- camel_object_unref (emf->session);
+ g_object_unref (emf->session);
g_hash_table_destroy (emf->inline_table);
@@ -189,7 +189,7 @@ emf_init (EMFormat *emf)
emf->session = e_shell_settings_get_pointer (shell_settings, "mail-session");
g_return_if_fail (emf->session != NULL);
- camel_object_ref (emf->session);
+ g_object_ref (emf->session);
}
GType
@@ -418,7 +418,7 @@ em_format_add_puri (EMFormat *emf,
puri->part_id = g_strdup(emf->part_id->str);
if (part) {
- camel_object_ref(part);
+ g_object_ref(part);
puri->part = part;
}
@@ -718,7 +718,7 @@ emf_clone_inlines(gpointer key, gpointer val, gpointer data)
if (emfc->valid)
new->valid = camel_cipher_validity_clone(emfc->valid);
if (emfc->secured)
- camel_object_ref((new->secured = emfc->secured));
+ g_object_ref((new->secured = emfc->secured));
}
static void
@@ -753,9 +753,9 @@ emf_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMime
/* what a mess */
if (folder != emf->folder) {
if (emf->folder)
- camel_object_unref(emf->folder);
+ g_object_unref(emf->folder);
if (folder)
- camel_object_ref(folder);
+ g_object_ref(folder);
emf->folder = folder;
}
@@ -766,9 +766,9 @@ emf_format_clone(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMime
if (msg != emf->message) {
if (emf->message)
- camel_object_unref(emf->message);
+ g_object_unref(emf->message);
if (msg)
- camel_object_ref(msg);
+ g_object_ref(msg);
emf->message = msg;
}
@@ -1248,14 +1248,14 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
null = camel_stream_null_new();
filter_stream = camel_stream_filter_new_with_stream(null);
- camel_object_unref(null);
+ g_object_unref(null);
windows = (CamelMimeFilterWindows *)camel_mime_filter_windows_new(charset);
camel_stream_filter_add(filter_stream, (CamelMimeFilter *)windows);
camel_data_wrapper_decode_to_stream(dw, (CamelStream *)filter_stream);
camel_stream_flush((CamelStream *)filter_stream);
- camel_object_unref(filter_stream);
+ g_object_unref(filter_stream);
charset = camel_mime_filter_windows_real_charset (windows);
} else if (charset == NULL) {
@@ -1267,7 +1267,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
if ((filter = camel_mime_filter_charset_new_convert(charset, "UTF-8"))) {
camel_stream_filter_add(filter_stream, (CamelMimeFilter *) filter);
- camel_object_unref(filter);
+ g_object_unref(filter);
}
max = -1;
@@ -1282,7 +1282,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
size = camel_data_wrapper_decode_to_stream(emf->mode == EM_FORMAT_SOURCE ? (CamelDataWrapper *)dw: camel_medium_get_content_object((CamelMedium *)dw), (CamelStream *)filter_stream);
camel_stream_flush((CamelStream *)filter_stream);
- camel_object_unref(filter_stream);
+ g_object_unref(filter_stream);
camel_stream_reset (mem_stream);
if (max == -1 || size == -1 || size < (max * 1024) || emf->composer) {
@@ -1293,7 +1293,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
}
if (windows)
- camel_object_unref(windows);
+ g_object_unref(windows);
}
/**
@@ -1379,14 +1379,14 @@ emf_application_xpkcs7mime(EMFormat *emf, CamelStream *stream, CamelMimePart *pa
emfc = emf_insert_cache(emf, emf->part_id->str);
emfc->valid = camel_cipher_validity_clone(valid);
- camel_object_ref((emfc->secured = opart));
+ g_object_ref((emfc->secured = opart));
add_validity_found (emf, valid);
em_format_format_secure(emf, stream, opart, valid);
}
- camel_object_unref(opart);
- camel_object_unref(context);
+ g_object_unref(opart);
+ g_object_unref(context);
camel_exception_free(ex);
}
#endif
@@ -1539,15 +1539,15 @@ emf_multipart_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
emfc = emf_insert_cache(emf, emf->part_id->str);
emfc->valid = camel_cipher_validity_clone(valid);
- camel_object_ref((emfc->secured = opart));
+ g_object_ref((emfc->secured = opart));
add_validity_found (emf, valid);
em_format_format_secure(emf, stream, opart, valid);
}
/* TODO: Make sure when we finalize this part, it is zero'd out */
- camel_object_unref(opart);
- camel_object_unref(context);
+ g_object_unref(opart);
+ g_object_unref(context);
camel_exception_free(ex);
}
@@ -1713,14 +1713,14 @@ emf_multipart_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *part, co
emfc = emf_insert_cache(emf, emf->part_id->str);
emfc->valid = camel_cipher_validity_clone(valid);
- camel_object_ref((emfc->secured = cpart));
+ g_object_ref((emfc->secured = cpart));
add_validity_found (emf, valid);
em_format_format_secure(emf, stream, cpart, valid);
}
camel_exception_free(ex);
- camel_object_unref(cipher);
+ g_object_unref(cipher);
}
}
@@ -1762,7 +1762,7 @@ emf_application_mbox (EMFormat *emf,
camel_seekable_stream_seek (
CAMEL_SEEKABLE_STREAM (mem_stream), 0, CAMEL_STREAM_SET);
camel_mime_parser_init_with_stream (parser, mem_stream);
- camel_object_unref (mem_stream);
+ g_object_unref (mem_stream);
/* Extract messages from the mbox. */
state = camel_mime_parser_step (parser, NULL, NULL);
@@ -1773,14 +1773,14 @@ emf_application_mbox (EMFormat *emf,
mime_part = CAMEL_MIME_PART (message);
if (camel_mime_part_construct_from_parser (mime_part, parser) == -1) {
- camel_object_unref (message);
+ g_object_unref (message);
break;
}
/* Render the message. */
handle->handler (emf, stream, mime_part, handle);
- camel_object_unref (message);
+ g_object_unref (message);
/* Skip past CAMEL_MIME_PARSER_STATE_FROM_END. */
state = camel_mime_parser_step (parser, NULL, NULL);
@@ -1788,7 +1788,7 @@ emf_application_mbox (EMFormat *emf,
state = camel_mime_parser_step (parser, NULL, NULL);
}
- camel_object_unref (parser);
+ g_object_unref (parser);
}
static void
@@ -1851,7 +1851,7 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E
em_format_format_source(emf, stream, ipart);
/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
camel_exception_free(ex);
- camel_object_unref(cipher);
+ g_object_unref(cipher);
return;
}
@@ -1862,13 +1862,13 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E
/* Add PGP header / footer filter */
pgp_filter = (CamelMimeFilterPgp *)camel_mime_filter_pgp_new();
camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)pgp_filter);
- camel_object_unref(pgp_filter);
+ g_object_unref(pgp_filter);
/* Pass through the filters that have been setup */
dw = camel_medium_get_content_object((CamelMedium *)ipart);
camel_data_wrapper_decode_to_stream(dw, (CamelStream *)filtered_stream);
camel_stream_flush((CamelStream *)filtered_stream);
- camel_object_unref(filtered_stream);
+ g_object_unref(filtered_stream);
/* Create a new text/plain MIME part containing the signed content preserving the original part's Content-Type params */
content_type = camel_mime_part_get_content_type (ipart);
@@ -1897,10 +1897,10 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E
em_format_format_secure(emf, stream, opart, valid);
/* Clean Up */
- camel_object_unref(dw);
- camel_object_unref(opart);
- camel_object_unref(ostream);
- camel_object_unref(cipher);
+ g_object_unref(dw);
+ g_object_unref(opart);
+ g_object_unref(ostream);
+ g_object_unref(cipher);
camel_exception_free(ex);
}
@@ -1928,8 +1928,8 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart
em_format_format_source(emf, stream, ipart);
/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
camel_exception_free(ex);
- camel_object_unref(cipher);
- camel_object_unref(opart);
+ g_object_unref(cipher);
+ g_object_unref(opart);
return;
}
@@ -1951,8 +1951,8 @@ emf_inlinepgp_encrypted(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart
em_format_format_secure(emf, stream, opart, valid);
/* Clean Up */
- camel_object_unref(opart);
- camel_object_unref (cipher);
+ g_object_unref(opart);
+ g_object_unref (cipher);
camel_exception_free (ex);
}
@@ -2026,7 +2026,7 @@ em_format_snoop_type (CamelMimePart *part)
g_free (ct);
}
- camel_object_unref(mem);
+ g_object_unref(mem);
}
d(printf("snooped part, magic_type '%s' name_type '%s'\n", magic_type, name_type));
diff --git a/mail/e-mail-local.c b/mail/e-mail-local.c
index 0944c7d..2dd753f 100644
--- a/mail/e-mail-local.c
+++ b/mail/e-mail-local.c
@@ -93,8 +93,7 @@ e_mail_local_init (const gchar *data_dir)
camel_url_free (url);
- camel_object_ref (service);
- local_store = CAMEL_STORE (service);
+ local_store = g_object_ref (service);
return;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 3bfa077..8cce1ec 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1061,7 +1061,7 @@ action_search_folder_recipient_cb (GtkAction *action,
inet_addr = camel_internet_address_new ();
camel_address_decode (CAMEL_ADDRESS (inet_addr), curl->path);
vfolder_gui_add_from_address (inet_addr, AUTO_TO, folder_uri);
- camel_object_unref (inet_addr);
+ g_object_unref (inet_addr);
}
camel_url_free (curl);
@@ -1102,7 +1102,7 @@ action_search_folder_sender_cb (GtkAction *action,
inet_addr = camel_internet_address_new ();
camel_address_decode (CAMEL_ADDRESS (inet_addr), curl->path);
vfolder_gui_add_from_address (inet_addr, AUTO_FROM, folder_uri);
- camel_object_unref (inet_addr);
+ g_object_unref (inet_addr);
}
camel_url_free (curl);
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 1fc3eb5..676c270 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -76,8 +76,7 @@ store_info_new (CamelStore *store,
store_info = g_slice_new0 (StoreInfo);
store_info->ref_count = 1;
- camel_object_ref (store);
- store_info->store = store;
+ store_info->store = g_object_ref (store);
if (display_name == NULL)
store_info->display_name =
@@ -115,14 +114,14 @@ store_info_unref (StoreInfo *store_info)
if (g_atomic_int_exchange_and_add (&store_info->ref_count, -1) > 1)
return;
- camel_object_unref (store_info->store);
+ g_object_unref (store_info->store);
g_free (store_info->display_name);
if (store_info->vtrash != NULL)
- camel_object_unref (store_info->vtrash);
+ g_object_unref (store_info->vtrash);
if (store_info->vjunk != NULL)
- camel_object_unref (store_info->vjunk);
+ g_object_unref (store_info->vjunk);
g_slice_free (StoreInfo, store_info);
}
@@ -321,7 +320,7 @@ e_mail_store_add_by_uri (const gchar *uri,
e_mail_store_add (CAMEL_STORE (service), display_name);
- camel_object_unref (service);
+ g_object_unref (service);
return CAMEL_STORE (service);
@@ -340,7 +339,7 @@ static void
mail_store_remove_cb (CamelStore *store)
{
camel_service_disconnect (CAMEL_SERVICE (store), TRUE, NULL);
- camel_object_unref (store);
+ g_object_unref (store);
}
void
@@ -360,7 +359,7 @@ e_mail_store_remove (CamelStore *store)
if (g_hash_table_lookup (store_table, store) == NULL)
return;
- camel_object_ref (store);
+ g_object_ref (store);
g_hash_table_remove (store_table, store);
mail_note_store_remove (store);
@@ -396,7 +395,7 @@ e_mail_store_remove_by_uri (const gchar *uri)
e_mail_store_remove (CAMEL_STORE (service));
- camel_object_unref (service);
+ g_object_unref (service);
}
void
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 44ad930..8cd0e52 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -115,11 +115,10 @@ emcs_set_drafts_info (struct emcs_t *emcs,
g_return_if_fail (drafts_uid != NULL);
if (emcs->drafts_folder != NULL)
- camel_object_unref (emcs->drafts_folder);
+ g_object_unref (emcs->drafts_folder);
g_free (emcs->drafts_uid);
- camel_object_ref (drafts_folder);
- emcs->drafts_folder = drafts_folder;
+ emcs->drafts_folder = g_object_ref (drafts_folder);
emcs->drafts_uid = g_strdup (drafts_uid);
}
@@ -135,11 +134,10 @@ emcs_set_folder_info (struct emcs_t *emcs,
g_return_if_fail (uid != NULL);
if (emcs->folder != NULL)
- camel_object_unref (emcs->folder);
+ g_object_unref (emcs->folder);
g_free (emcs->uid);
- camel_object_ref (folder);
- emcs->folder = folder;
+ emcs->folder = g_object_ref (folder);
emcs->uid = g_strdup (uid);
emcs->flags = flags;
emcs->set = set;
@@ -149,11 +147,11 @@ static void
free_emcs (struct emcs_t *emcs)
{
if (emcs->drafts_folder != NULL)
- camel_object_unref (emcs->drafts_folder);
+ g_object_unref (emcs->drafts_folder);
g_free (emcs->drafts_uid);
if (emcs->folder != NULL)
- camel_object_unref (emcs->folder);
+ g_object_unref (emcs->folder);
g_free (emcs->uid);
g_free (emcs);
@@ -243,7 +241,7 @@ composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
camel_folder_set_message_flags (emcs->drafts_folder, emcs->drafts_uid,
CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
- camel_object_unref (emcs->drafts_folder);
+ g_object_unref (emcs->drafts_folder);
emcs->drafts_folder = NULL;
g_free (emcs->drafts_uid);
emcs->drafts_uid = NULL;
@@ -253,7 +251,7 @@ composer_send_queued_cb (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
/* set any replied flags etc */
camel_folder_set_message_flags (emcs->folder, emcs->uid, emcs->flags, emcs->set);
camel_folder_set_message_user_flag (emcs->folder, emcs->uid, "receipt-handled", TRUE);
- camel_object_unref (emcs->folder);
+ g_object_unref (emcs->folder);
emcs->folder = NULL;
g_free (emcs->uid);
emcs->uid = NULL;
@@ -396,7 +394,7 @@ composer_get_message (EMsgComposer *composer, gboolean save_html_object_data)
e_destination_freev (recipients_bcc);
}
- camel_object_unref (cia);
+ g_object_unref (cia);
post_to_header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_POST_TO);
if (e_composer_header_get_visible (post_to_header)) {
@@ -531,7 +529,7 @@ em_utils_composer_send_cb (EMsgComposer *composer)
return;
folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
- camel_object_ref (folder);
+ g_object_ref (folder);
/* mail the message */
e_msg_composer_set_mail_sent (composer, TRUE);
@@ -551,8 +549,8 @@ em_utils_composer_send_cb (EMsgComposer *composer)
mail_append_mail (
folder, message, info, composer_send_queued_cb, send);
- camel_object_unref (folder);
- camel_object_unref (message);
+ g_object_unref (folder);
+ g_object_unref (message);
}
struct _save_draft_info {
@@ -597,7 +595,7 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
camel_folder_set_message_flags (emcs->drafts_folder, emcs->drafts_uid,
CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN,
CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN);
- camel_object_unref (emcs->drafts_folder);
+ g_object_unref (emcs->drafts_folder);
emcs->drafts_folder = NULL;
g_free (emcs->drafts_uid);
emcs->drafts_uid = NULL;
@@ -606,15 +604,14 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
if (emcs->folder) {
/* set the replied flags etc */
camel_folder_set_message_flags (emcs->folder, emcs->uid, emcs->flags, emcs->set);
- camel_object_unref (emcs->folder);
+ g_object_unref (emcs->folder);
emcs->folder = NULL;
g_free (emcs->uid);
emcs->uid = NULL;
}
if (appended_uid) {
- camel_object_ref (folder);
- emcs->drafts_folder = folder;
+ emcs->drafts_folder = g_object_ref (folder);
emcs->drafts_uid = g_strdup (appended_uid);
}
@@ -634,10 +631,8 @@ save_draft_folder (gchar *uri, CamelFolder *folder, gpointer data)
{
CamelFolder **save = data;
- if (folder) {
- *save = folder;
- camel_object_ref (folder);
- }
+ if (folder)
+ *save = g_object_ref (folder);
}
static void
@@ -682,27 +677,24 @@ em_utils_composer_save_draft_cb (EMsgComposer *composer)
if (!folder || !account->enabled) {
if (e_error_run((GtkWindow *)composer, "mail:ask-default-drafts", NULL) != GTK_RESPONSE_YES) {
g_object_unref(composer);
- camel_object_unref(msg);
+ g_object_unref(msg);
if (sdi->emcs)
emcs_unref(sdi->emcs);
g_free(sdi);
return;
}
- folder = local_drafts_folder;
- camel_object_ref (local_drafts_folder);
+ folder = g_object_ref (local_drafts_folder);
}
- } else {
- folder = local_drafts_folder;
- camel_object_ref (folder);
- }
+ } else
+ folder = g_object_ref (local_drafts_folder);
info = camel_message_info_new(NULL);
camel_message_info_set_flags(info, CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_SEEN, ~0);
mail_append_mail (folder, msg, info, save_draft_done, sdi);
- camel_object_unref (folder);
- camel_object_unref (msg);
+ g_object_unref (folder);
+ g_object_unref (msg);
}
static void
@@ -1116,7 +1108,7 @@ composer_destroy_fad_cb (gpointer user_data, GObject *deadbeef)
struct forward_attached_data *fad = (struct forward_attached_data*) user_data;
if (fad) {
- camel_object_unref (fad->folder);
+ g_object_unref (fad->folder);
em_utils_uids_free (fad->uids);
g_free (fad);
}
@@ -1130,10 +1122,8 @@ setup_forward_attached_callbacks (EMsgComposer *composer, CamelFolder *folder, G
if (!composer || !folder || !uids || !uids->len)
return;
- camel_object_ref (folder);
-
fad = g_new0 (struct forward_attached_data, 1);
- fad->folder = folder;
+ fad->folder = g_object_ref (folder);
fad->uids = em_utils_uids_copy (uids);
g_signal_connect (composer, "send", G_CALLBACK (update_forwarded_flags_cb), fad);
@@ -1338,7 +1328,7 @@ em_utils_forward_message (CamelMimeMessage *message, const gchar *fromuri)
subject = mail_tool_generate_forward_subject (message);
composer = forward_attached (NULL, NULL, messages, part, subject, fromuri);
- camel_object_unref (part);
+ g_object_unref (part);
g_free (subject);
break;
case MAIL_CONFIG_FORWARD_INLINE:
@@ -1575,14 +1565,14 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
"Your message to %s about \"%s\" on %s has been read.",
self_address, message_subject, message_date);
camel_data_wrapper_construct_from_stream (receipt_text, stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
part = camel_mime_part_new ();
camel_medium_set_content_object (CAMEL_MEDIUM (part), receipt_text);
camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE);
- camel_object_unref (receipt_text);
+ g_object_unref (receipt_text);
camel_multipart_add_part (body, part);
- camel_object_unref (part);
+ g_object_unref (part);
/* Create the machine-readable receipt */
receipt_data = camel_data_wrapper_new ();
@@ -1603,7 +1593,7 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
"Disposition: manual-action/MDN-sent-manually; displayed\n",
ua, recipient, message_id);
camel_data_wrapper_construct_from_stream (receipt_data, stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
g_free (ua);
g_free (recipient);
@@ -1611,13 +1601,13 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
camel_medium_set_content_object (CAMEL_MEDIUM (part), receipt_data);
camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_7BIT);
- camel_object_unref (receipt_data);
+ g_object_unref (receipt_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 (receipt), CAMEL_DATA_WRAPPER (body));
- camel_object_unref (body);
+ g_object_unref (body);
receipt_subject = g_strdup_printf ("Delivery Notification for: \"%s\"", message_subject);
camel_mime_message_set_subject (receipt, receipt_subject);
@@ -1626,12 +1616,12 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
addr = camel_internet_address_new ();
camel_address_decode (CAMEL_ADDRESS (addr), self_address);
camel_mime_message_set_from (receipt, addr);
- camel_object_unref (addr);
+ g_object_unref (addr);
addr = camel_internet_address_new ();
camel_address_decode (CAMEL_ADDRESS (addr), receipt_address);
camel_mime_message_set_recipients (receipt, CAMEL_RECIPIENT_TYPE_TO, addr);
- camel_object_unref (addr);
+ g_object_unref (addr);
camel_medium_set_header (CAMEL_MEDIUM (receipt), "Return-Path", "<>");
if (account) {
@@ -1701,7 +1691,7 @@ em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, co
camel_data_wrapper_write_to_stream ((CamelDataWrapper *)message, mem);
camel_seekable_stream_seek (CAMEL_SEEKABLE_STREAM (mem), 0, CAMEL_STREAM_SET);
camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)forward, mem);
- camel_object_unref (mem);
+ g_object_unref (mem);
/* clear previous recipients */
camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_TO, NULL);
@@ -1726,13 +1716,13 @@ em_utils_forward_message_raw (CamelFolder *folder, CamelMimeMessage *message, co
addr = camel_internet_address_new ();
camel_internet_address_add (addr, account->id->name, account->id->address);
camel_mime_message_set_from (forward, addr);
- camel_object_unref (addr);
+ g_object_unref (addr);
/* to */
addr = camel_internet_address_new ();
camel_address_decode (CAMEL_ADDRESS (addr), address);
camel_mime_message_set_recipients (forward, CAMEL_RECIPIENT_TYPE_TO, addr);
- camel_object_unref (addr);
+ g_object_unref (addr);
/* subject */
subject = mail_tool_generate_forward_subject (message);
@@ -2321,7 +2311,7 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat *
/* attach the original message as an attachment */
part = mail_tool_make_message_attachment (message);
e_msg_composer_attach (composer, part);
- camel_object_unref (part);
+ g_object_unref (part);
break;
case MAIL_CONFIG_REPLY_OUTLOOK:
text = em_utils_message_to_html (message, _("-----Original Message-----"), EM_FORMAT_QUOTE_HEADERS, &len, source, start_bottom ? "<BR>" : NULL, &validity_found);
@@ -2463,9 +2453,9 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
e_msg_composer_add_message_attachments (composer, message, TRUE);
if (postto)
- camel_object_unref(postto);
- camel_object_unref(to);
- camel_object_unref(cc);
+ g_object_unref(postto);
+ g_object_unref(to);
+ g_object_unref(cc);
composer_set_body (composer, message, source);
diff --git a/mail/em-config.c b/mail/em-config.c
index 4b1e835..359307b 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -104,7 +104,7 @@ emp_target_free(EConfig *ep, EConfigTarget *t)
EMConfigTargetFolder *s = (EMConfigTargetFolder *)t;
g_free(s->uri);
- camel_object_unref(s->folder);
+ g_object_unref(s->folder);
break; }
case EM_CONFIG_TARGET_PREFS: {
EMConfigTargetPrefs *s = (EMConfigTargetPrefs *)t;
@@ -194,8 +194,7 @@ em_config_target_new_folder(EMConfig *emp, CamelFolder *folder, const gchar *uri
EMConfigTargetFolder *t = e_config_target_new(&emp->config, EM_CONFIG_TARGET_FOLDER, sizeof(*t));
t->uri = g_strdup(uri);
- t->folder = folder;
- camel_object_ref(folder);
+ t->folder = g_object_ref (folder);
return t;
}
diff --git a/mail/em-event.c b/mail/em-event.c
index 7cb4c19..bfba660 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -74,9 +74,9 @@ eme_target_free(EEvent *ep, EEventTarget *t)
EMEventTargetMessage *s = (EMEventTargetMessage *)t;
if (s->folder)
- camel_object_unref(s->folder);
+ g_object_unref(s->folder);
if (s->message)
- camel_object_unref(s->message);
+ g_object_unref(s->message);
g_free(s->uid);
if (s->composer)
g_object_unref (s->composer);
@@ -173,10 +173,10 @@ em_event_target_new_message(EMEvent *eme, CamelFolder *folder, CamelMimeMessage
t->uid = g_strdup (uid);
t->folder = folder;
if (folder)
- camel_object_ref(folder);
+ g_object_ref(folder);
t->message = message;
if (message)
- camel_object_ref(message);
+ g_object_ref(message);
t->target.mask = ~flags;
if (composer)
t->composer = g_object_ref(G_OBJECT(composer));
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 7b79571..38ba820 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -118,7 +118,7 @@ emfp_free(EConfig *ec, GSList *items, gpointer data)
camel_object_free (prop_data->object, CAMEL_FOLDER_PROPERTIES, prop_data->properties);
camel_object_free (prop_data->object, CAMEL_FOLDER_NAME, prop_data->name);
- camel_object_unref (prop_data->object);
+ g_object_unref (prop_data->object);
g_free (prop_data->argv);
camel_folder_quota_info_free (prop_data->quota);
@@ -318,8 +318,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder,
local_store = e_mail_local_get_store ();
prop_data = g_malloc0 (sizeof (*prop_data));
- prop_data->object = folder;
- camel_object_ref (folder);
+ prop_data->object = g_object_ref (folder);
prop_data->quota = camel_folder_quota_info_clone (quota);
/*
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index b753cd7..fd57d48 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -108,7 +108,7 @@ store_info_free (EMFolderTreeModelStoreInfo *si)
camel_object_remove_event (si->store, si->unsubscribed_id);
g_free (si->display_name);
- camel_object_unref (si->store);
+ g_object_unref (si->store);
gtk_tree_row_reference_free (si->row);
g_hash_table_destroy (si->full_hash);
g_free (si);
@@ -215,7 +215,7 @@ account_changed_cb (EAccountList *accounts,
}
em_folder_tree_model_add_store (model, store, account->name);
- camel_object_unref (store);
+ g_object_unref (store);
}
static void
@@ -566,7 +566,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
unread = total > 0 ? total : 0;
}
- camel_object_unref(folder);
+ g_object_unref(folder);
}
/* TODO: maybe this should be handled by mail_get_folderinfo (except em-folder-tree doesn't use it, duh) */
@@ -743,7 +743,7 @@ folder_subscribed (CamelStore *store,
g_signal_emit (model, signals[FOLDER_ADDED], 0, fi->full_name, fi->uri);
done:
- camel_object_unref (store);
+ g_object_unref (store);
camel_folder_info_free (fi);
}
@@ -754,7 +754,7 @@ folder_subscribed_cb (CamelStore *store,
{
CamelFolderInfo *fi;
- camel_object_ref (store);
+ g_object_ref (store);
fi = camel_folder_info_clone (event_data);
mail_async_event_emit (
@@ -787,7 +787,7 @@ folder_unsubscribed (CamelStore *store,
em_folder_tree_model_remove_folders (model, si, &iter);
done:
- camel_object_unref (store);
+ g_object_unref (store);
camel_folder_info_free (fi);
}
@@ -798,7 +798,7 @@ folder_unsubscribed_cb (CamelStore *store,
{
CamelFolderInfo *fi;
- camel_object_ref (store);
+ g_object_ref (store);
fi = camel_folder_info_clone (event_data);
mail_async_event_emit (
@@ -818,7 +818,7 @@ folder_created_cb (CamelStore *store,
if (camel_store_supports_subscriptions (store))
return;
- camel_object_ref (store);
+ g_object_ref (store);
fi = camel_folder_info_clone (event_data);
mail_async_event_emit (
@@ -838,7 +838,7 @@ folder_deleted_cb (CamelStore *store,
if (camel_store_supports_subscriptions (store))
return;
- camel_object_ref (store);
+ g_object_ref (store);
fi = camel_folder_info_clone (event_data);
mail_async_event_emit (
@@ -894,7 +894,7 @@ folder_renamed (CamelStore *store,
em_folder_tree_model_set_folder_info (model, &iter, si, info->new, TRUE);
done:
- camel_object_unref (store);
+ g_object_unref (store);
g_free (info->old_base);
camel_folder_info_free (info->new);
@@ -908,7 +908,7 @@ folder_renamed_cb (CamelStore *store,
{
CamelRenameInfo *rinfo, *info = event_data;
- camel_object_ref (store);
+ g_object_ref (store);
rinfo = g_new0 (CamelRenameInfo, 1);
rinfo->old_base = g_strdup (info->old_base);
@@ -963,8 +963,7 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
si = g_new (EMFolderTreeModelStoreInfo, 1);
si->display_name = g_strdup (display_name);
- camel_object_ref (store);
- si->store = store;
+ si->store = g_object_ref (store);
si->account = account;
si->row = gtk_tree_row_reference_copy (reference);
si->full_hash = g_hash_table_new_full (
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 2865e50..ace89f5 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -311,7 +311,7 @@ folder_tree_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m)
gtk_tree_row_reference_free (m->root);
g_object_unref(m->folder_tree);
- camel_object_unref (m->store);
+ g_object_unref (m->store);
g_free (m->top);
}
@@ -335,7 +335,7 @@ folder_tree_free_select_uri (struct _selected_uri *u)
{
g_free (u->uri);
if (u->store)
- camel_object_unref (u->store);
+ g_object_unref (u->store);
g_free (u->key);
g_free (u->path);
g_free (u);
@@ -772,8 +772,7 @@ folder_tree_row_expanded (GtkTreeView *tree_view,
msg = mail_msg_new (&get_folder_info_info);
msg->root = gtk_tree_row_reference_new (model, path);
- camel_object_ref (store);
- msg->store = store;
+ msg->store = g_object_ref (store);
msg->folder_tree = g_object_ref (tree_view);
msg->top = full_name;
msg->flags =
@@ -1205,12 +1204,12 @@ folder_tree_expand_node (const gchar *key, EMFolderTree *folder_tree)
if (!(store = vfolder_store))
return;
- camel_object_ref (store);
+ g_object_ref (store);
} else if (!strcmp (uid, "local")) {
if (!(store = e_mail_local_get_store ()))
return;
- camel_object_ref (store);
+ g_object_ref (store);
} else {
return;
}
@@ -1218,11 +1217,11 @@ folder_tree_expand_node (const gchar *key, EMFolderTree *folder_tree)
si = em_folder_tree_model_lookup_store_info (
EM_FOLDER_TREE_MODEL (model), store);
if (si == NULL) {
- camel_object_unref (store);
+ g_object_unref (store);
return;
}
- camel_object_unref (store);
+ g_object_unref (store);
if (p != NULL) {
if (!(row = g_hash_table_lookup (si->full_hash, p + 1)))
@@ -1413,7 +1412,7 @@ tree_drag_data_get(GtkWidget *widget, GdkDragContext *context, GtkSelectionData
em_utils_selection_set_urilist(selection, folder, uids);
camel_folder_free_uids(folder, uids);
- camel_object_unref(folder);
+ g_object_unref(folder);
}
break;
default:
@@ -1460,7 +1459,7 @@ folder_tree_drop_folder(struct _DragDataReceivedAsync *m)
return;
em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move);
- camel_object_unref(src);
+ g_object_unref(src);
}
static gchar *
@@ -1518,7 +1517,7 @@ folder_tree_drop_async__exec (struct _DragDataReceivedAsync *m)
default:
abort();
}
- camel_object_unref(folder);
+ g_object_unref(folder);
}
}
@@ -1526,7 +1525,7 @@ static void
folder_tree_drop_async__free (struct _DragDataReceivedAsync *m)
{
g_object_unref(m->context);
- camel_object_unref(m->store);
+ g_object_unref(m->store);
g_free(m->full_name);
g_free(m->selection->data);
@@ -1593,8 +1592,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint
m = mail_msg_new (&folder_tree_drop_async_info);
m->context = context;
g_object_ref(context);
- m->store = store;
- camel_object_ref(store);
+ m->store = g_object_ref (store);
m->full_name = full_name;
m->action = context->action;
m->info = info;
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 8b1dab9..d89afc9 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -162,7 +162,7 @@ emft_copy_folders__exec (struct _EMCopyFolders *m)
goto exception;
if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) {
- camel_object_unref (fromfolder);
+ g_object_unref (fromfolder);
goto exception;
}
@@ -173,8 +173,8 @@ emft_copy_folders__exec (struct _EMCopyFolders *m)
if (m->delete && !camel_exception_is_set (&m->base.ex))
camel_folder_sync(fromfolder, TRUE, NULL);
- camel_object_unref (fromfolder);
- camel_object_unref (tofolder);
+ g_object_unref (fromfolder);
+ g_object_unref (tofolder);
}
}
@@ -221,8 +221,8 @@ emft_copy_folders__exec (struct _EMCopyFolders *m)
static void
emft_copy_folders__free (struct _EMCopyFolders *m)
{
- camel_object_unref (m->fromstore);
- camel_object_unref (m->tostore);
+ g_object_unref (m->fromstore);
+ g_object_unref (m->tostore);
g_free (m->frombase);
g_free (m->tobase);
@@ -243,10 +243,8 @@ em_folder_utils_copy_folders(CamelStore *fromstore, const gchar *frombase, Camel
gint seq;
m = mail_msg_new (©_folders_info);
- camel_object_ref (fromstore);
- m->fromstore = fromstore;
- camel_object_ref (tostore);
- m->tostore = tostore;
+ m->fromstore = g_object_ref (fromstore);
+ m->tostore = g_object_ref (tostore);
m->frombase = g_strdup (frombase);
m->tobase = g_strdup (tobase);
m->delete = delete;
@@ -316,9 +314,9 @@ emfu_copy_folder_selected (const gchar *uri, gpointer data)
camel_url_free (url);
fail:
if (fromstore)
- camel_object_unref(fromstore);
+ g_object_unref(fromstore);
if (tostore)
- camel_object_unref(tostore);
+ g_object_unref(tostore);
camel_exception_clear (&ex);
g_free (cfd);
}
@@ -454,12 +452,12 @@ em_folder_utils_delete_folder (CamelFolder *folder)
return;
}
- camel_object_ref (folder);
+ g_object_ref (folder);
dialog = e_error_new (parent,
(folder->parent_store && CAMEL_IS_VEE_STORE(folder->parent_store))?"mail:ask-delete-vfolder":"mail:ask-delete-folder",
folder->full_name, NULL);
- g_object_set_data_full ((GObject *) dialog, "folder", folder, camel_object_unref);
+ g_object_set_data_full ((GObject *) dialog, "folder", folder, g_object_unref);
g_signal_connect (dialog, "response", G_CALLBACK (emfu_delete_response), NULL);
gtk_widget_show (dialog);
}
@@ -517,7 +515,7 @@ static void
emfu_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);
@@ -549,8 +547,7 @@ emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done
}
m = mail_msg_new (&create_folder_info);
- camel_object_ref (store);
- m->store = store;
+ m->store = g_object_ref (store);
m->full_name = g_strdup (full_name);
m->parent = g_strdup (parent);
m->name = g_strdup (name);
@@ -613,7 +610,7 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs, gint response, gpointer
si = em_folder_tree_model_lookup_store_info (
EM_FOLDER_TREE_MODEL (model), store);
if (si == NULL) {
- camel_object_unref (store);
+ g_object_unref (store);
g_return_if_reached();
}
@@ -639,7 +636,7 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs, gint response, gpointer
emfu_create_folder_real (si->store, path, new_folder_created_cb, emcftd);
}
- camel_object_unref (store);
+ g_object_unref (store);
camel_exception_clear (&ex);
}
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index f2f001e..44668b1 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -718,7 +718,7 @@ efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMF
camel_stream_printf(stream, "<td align=\"left\"><img src=\"%s\"></td>", classid);
(void)em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efhd_write_image);
g_free(classid);
- camel_object_unref(iconpart);
+ g_object_unref(iconpart);
}
}
@@ -1003,7 +1003,7 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (view));
gtk_text_buffer_set_text (buffer, (gchar *)info->mstream->buffer->data, info->mstream->buffer->len);
- camel_object_unref(info->mstream);
+ g_object_unref(info->mstream);
info->mstream = NULL;
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 6fbc607..59f2bc8 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -245,7 +245,7 @@ efh_format_exec (struct _format_msg *m)
format->base = base;
/* clean up the job */
- camel_object_unref(job->stream);
+ g_object_unref(job->stream);
if (job->base)
camel_url_free(job->base);
g_free(job);
@@ -260,7 +260,7 @@ efh_format_exec (struct _format_msg *m)
d(printf("out of jobs, closing root stream\n"));
camel_stream_write_string((CamelStream *)m->estream, "</body>\n</html>\n");
camel_stream_close((CamelStream *)m->estream);
- camel_object_unref(m->estream);
+ g_object_unref(m->estream);
m->estream = NULL;
}
@@ -289,13 +289,13 @@ efh_format_free (struct _format_msg *m)
g_object_unref(m->format);
if (m->estream) {
camel_stream_close((CamelStream *)m->estream);
- camel_object_unref(m->estream);
+ g_object_unref(m->estream);
}
if (m->folder)
- camel_object_unref(m->folder);
+ g_object_unref(m->folder);
g_free(m->uid);
if (m->message)
- camel_object_unref(m->message);
+ g_object_unref(m->message);
if (m->format_source)
g_object_unref(m->format_source);
}
@@ -385,7 +385,7 @@ static void
efh_free_cache(struct _EMFormatHTMLCache *efhc)
{
if (efhc->textmp)
- camel_object_unref(efhc->textmp);
+ g_object_unref(efhc->textmp);
g_free(efhc);
}
@@ -640,10 +640,10 @@ efh_format_clone (EMFormat *emf,
g_object_ref (emfsource);
if (folder != NULL)
- camel_object_ref (folder);
+ g_object_ref (folder);
if (msg != NULL)
- camel_object_ref (msg);
+ g_object_ref (msg);
m = mail_msg_new (&efh_format_info);
m->format = g_object_ref (emf);
@@ -696,11 +696,11 @@ efh_format_source (EMFormat *emf,
CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES |
CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0);
camel_stream_filter_add (filtered_stream, filter);
- camel_object_unref (filter);
+ g_object_unref (filter);
camel_stream_write_string (stream, "<table><tr><td><tt>");
em_format_format_text (emf, (CamelStream *) filtered_stream, dw);
- camel_object_unref (filtered_stream);
+ g_object_unref (filtered_stream);
camel_stream_write_string(stream, "</tt></td></tr></table>");
}
@@ -1194,12 +1194,12 @@ em_format_html_file_part(EMFormatHTML *efh, const gchar *mime_type, const gchar
part = camel_mime_part_new();
dw = camel_data_wrapper_new();
camel_data_wrapper_construct_from_stream(dw, stream);
- camel_object_unref(stream);
+ g_object_unref(stream);
if (mime_type)
camel_data_wrapper_set_mime_type(dw, mime_type);
part = camel_mime_part_new();
camel_medium_set_content_object((CamelMedium *)part, dw);
- camel_object_unref(dw);
+ g_object_unref(dw);
basename = g_path_get_basename (filename);
camel_mime_part_set_filename(part, basename);
g_free (basename);
@@ -1435,10 +1435,10 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled)
/* do not store broken files in a cache */
if (n != 0)
camel_data_cache_remove(emfh_http_cache, EMFH_HTTP_CACHE_PATH, job->u.uri, NULL);
- camel_object_unref(costream);
+ g_object_unref(costream);
}
- camel_object_unref(instream);
+ g_object_unref(instream);
done:
camel_operation_end(NULL);
badurl:
@@ -1589,7 +1589,7 @@ efh_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, Camel
iconpart = em_format_html_file_part((EMFormatHTML *)emf, "image/png", iconpath);
if (iconpart) {
(void)em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image);
- camel_object_unref(iconpart);
+ g_object_unref(iconpart);
}
g_free (iconpath);
g_free(classid);
@@ -1663,19 +1663,19 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
null = camel_stream_null_new();
filtered_stream = camel_stream_filter_new_with_stream(null);
- camel_object_unref(null);
+ g_object_unref(null);
inline_filter = em_inline_filter_new(camel_mime_part_get_encoding(part), ct);
camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)inline_filter);
camel_data_wrapper_write_to_stream(dw, (CamelStream *)filtered_stream);
camel_stream_close((CamelStream *)filtered_stream);
- camel_object_unref(filtered_stream);
+ g_object_unref(filtered_stream);
mp = em_inline_filter_get_multipart(inline_filter);
if (efhc == NULL)
efhc = efh_insert_cache(efh, ((EMFormat *)efh)->part_id->str);
efhc->textmp = mp;
- camel_object_unref(inline_filter);
+ g_object_unref(inline_filter);
camel_content_type_unref(ct);
}
@@ -1684,7 +1684,7 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
filtered_stream = camel_stream_filter_new_with_stream(stream);
html_filter = camel_mime_filter_tohtml_new(flags, rgb);
camel_stream_filter_add(filtered_stream, html_filter);
- camel_object_unref(html_filter);
+ g_object_unref(html_filter);
/* We handle our made-up multipart here, so we don't recursively call ourselves */
@@ -1721,7 +1721,7 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
}
}
- camel_object_unref(filtered_stream);
+ g_object_unref(filtered_stream);
}
static void
@@ -1744,7 +1744,7 @@ efh_text_enriched(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, E
enriched = camel_mime_filter_enriched_new(flags);
filtered_stream = camel_stream_filter_new_with_stream (stream);
camel_stream_filter_add(filtered_stream, enriched);
- camel_object_unref(enriched);
+ g_object_unref(enriched);
camel_stream_printf (
stream, "<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px; color: #%06x;\">\n" EFH_MESSAGE_START,
@@ -1760,7 +1760,7 @@ efh_text_enriched(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, E
em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
- camel_object_unref(filtered_stream);
+ g_object_unref(filtered_stream);
camel_stream_write_string(stream, "</div>");
}
@@ -1778,7 +1778,7 @@ efh_write_text_html(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri)
dw = camel_medium_get_content_object(puri->part);
if (dw)
camel_data_wrapper_write_to_stream(dw, out);
- camel_object_unref(out);
+ g_object_unref(out);
#endif
em_format_format_text(emf, stream, (CamelDataWrapper *)puri->part);
}
@@ -1954,7 +1954,7 @@ efh_message_deliverystatus(EMFormatHTML *efh, CamelStream *stream, CamelMimePart
filtered_stream = camel_stream_filter_new_with_stream(stream);
html_filter = camel_mime_filter_tohtml_new(efh->text_html_flags, rgb);
camel_stream_filter_add(filtered_stream, html_filter);
- camel_object_unref(html_filter);
+ g_object_unref(html_filter);
camel_stream_write_string(stream, "<tt>\n" EFH_MESSAGE_START);
em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, (CamelDataWrapper *)part);
@@ -2083,8 +2083,7 @@ efh_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, c
/* queue a job to check for un-referenced parts to add as attachments */
job = em_format_html_job_new((EMFormatHTML *)emf, emfh_multipart_related_check, NULL);
- job->stream = stream;
- camel_object_ref(stream);
+ job->stream = g_object_ref (stream);
em_format_html_job_queue((EMFormatHTML *)emf, job);
em_format_pull_level(emf);
@@ -2696,11 +2695,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
classid);
em_format_add_puri(emf, sizeof(EMFormatPURI), classid,
photopart, efh_write_image);
- camel_object_unref(photopart);
+ g_object_unref(photopart);
g_free(classid);
}
- camel_object_unref(cia);
+ g_object_unref(cia);
}
if (!contact_has_photo && face_decoded) {
@@ -2712,7 +2711,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
classid = g_strdup_printf("icon:///em-format-html/face/photo/header");
camel_stream_printf(stream, "<td align=\"right\" valign=\"top\"><img width=48 src=\"%s\"></td>", classid);
em_format_add_puri(emf, sizeof(EMFormatPURI), classid, part, efh_write_image);
- camel_object_unref(part);
+ g_object_unref(part);
}
if (have_icon && efh->show_icon) {
@@ -2735,7 +2734,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
if (iconpart) {
em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image);
- camel_object_unref(iconpart);
+ g_object_unref(iconpart);
}
g_free(classid);
}
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 5daae11..94aefb0 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -145,7 +145,7 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len)
dw = camel_data_wrapper_new();
camel_data_wrapper_construct_from_stream(dw, mem);
- camel_object_unref(mem);
+ g_object_unref(mem);
if (emif_types[emif->state].plain && emif->base_type) {
camel_content_type_ref (emif->base_type);
@@ -169,7 +169,7 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len)
part = camel_mime_part_new();
camel_medium_set_content_object((CamelMedium *)part, dw);
camel_mime_part_set_encoding(part, encoding);
- camel_object_unref(dw);
+ g_object_unref(dw);
if (emif->filename)
camel_mime_part_set_filename(part, emif->filename);
@@ -366,7 +366,7 @@ emif_reset(CamelMimeFilter *f)
while (l) {
GSList *n = l->next;
- camel_object_unref(l->data);
+ g_object_unref(l->data);
g_slist_free_1(l);
l = n;
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 76fec73..9e7bc02 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -147,7 +147,7 @@ sub_unref(EMSubscribe *sub)
l = n;
}
if (sub->store)
- camel_object_unref(sub->store);
+ g_object_unref(sub->store);
g_free(sub->store_uri);
g_free(sub);
}
@@ -607,8 +607,7 @@ subscribe_set_store(EMSubscribe *sub, CamelStore *store)
GtkCellRenderer *renderer;
GtkTreeStore *model;
- sub->store = store;
- camel_object_ref(store);
+ sub->store = g_object_ref (store);
sub->folders = g_hash_table_new_full (
g_str_hash, g_str_equal,
(GDestroyNotify) NULL,
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index 982a56c..97c12ed 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -107,7 +107,7 @@ emss_sync_op (EMSyncStream *emss, enum _write_msg_t op,
msg.string = string;
msg.len = len;
- camel_object_ref (emss);
+ g_object_ref (emss);
if (emss->idle_id)
g_source_remove (emss->idle_id);
@@ -116,7 +116,7 @@ emss_sync_op (EMSyncStream *emss, enum _write_msg_t op,
e_flag_wait (msg.done);
e_flag_free (msg.done);
- camel_object_unref (emss);
+ g_object_unref (emss);
}
static gssize
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 407c686..b431519 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -549,7 +549,7 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr
from_filter = camel_mime_filter_from_new();
filtered_stream = camel_stream_filter_new_with_stream(stream);
camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)from_filter);
- camel_object_unref(from_filter);
+ g_object_unref(from_filter);
for (i=0; i<uids->len; i++) {
CamelMimeMessage *message;
@@ -571,13 +571,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;
}
@@ -600,12 +600,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;
@@ -613,7 +613,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);
@@ -642,7 +642,7 @@ em_utils_selection_set_mailbox(GtkSelectionData *data, CamelFolder *folder, GPtr
((CamelStreamMem *)stream)->buffer->data,
((CamelStreamMem *)stream)->buffer->len);
- camel_object_unref(stream);
+ g_object_unref(stream);
}
/**
@@ -667,7 +667,7 @@ em_utils_selection_get_mailbox(GtkSelectionData *data, CamelFolder *folder)
/* NB: Although copying would let us run this async ... which it should */
stream = (CamelStream *)camel_stream_mem_new_with_buffer((gchar *)data->data, data->length);
em_utils_read_messages_from_stream(folder, stream);
- camel_object_unref(stream);
+ g_object_unref(stream);
}
/**
@@ -692,8 +692,8 @@ em_utils_selection_get_message(GtkSelectionData *data, CamelFolder *folder)
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);
}
@@ -768,7 +768,7 @@ em_utils_selection_get_uidlist(GtkSelectionData *data, CamelFolder *dest, gint m
folder = mail_tool_uri_to_folder((gchar *)data->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);
@@ -836,7 +836,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);
@@ -880,7 +880,7 @@ em_utils_selection_get_urilist(GtkSelectionData *data, CamelFolder *folder)
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);
}
@@ -1259,7 +1259,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)
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 6e45734..b8926d2 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -167,7 +167,7 @@ import_mbox_exec (struct _import_mbox_msg *m)
msg = camel_mime_message_new();
if (camel_mime_part_construct_from_parser((CamelMimePart *)msg, mp) == -1) {
/* set exception? */
- camel_object_unref(msg);
+ g_object_unref(msg);
break;
}
@@ -186,7 +186,7 @@ import_mbox_exec (struct _import_mbox_msg *m)
camel_message_info_set_flags(info, flags, ~0);
camel_folder_append_message(folder, msg, info, NULL, &m->base.ex);
camel_message_info_free(info);
- camel_object_unref(msg);
+ g_object_unref(msg);
if (camel_exception_is_set(&m->base.ex))
break;
@@ -200,11 +200,11 @@ import_mbox_exec (struct _import_mbox_msg *m)
if (m->cancel)
camel_operation_register(oldcancel);
fail2:
- camel_object_unref(mp);
+ g_object_unref(mp);
}
fail1:
camel_folder_sync(folder, FALSE, NULL);
- camel_object_unref(folder);
+ g_object_unref(folder);
}
static void
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 59f823f..4e904d1 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -142,7 +142,7 @@ free_update(struct _folder_update *up)
g_free (up->full_name);
g_free (up->uri);
if (up->store)
- camel_object_unref(up->store);
+ g_object_unref(up->store);
g_free (up->oldfull);
g_free (up->olduri);
g_free (up->msg_uid);
@@ -224,7 +224,7 @@ real_flush_updates (void)
if (folder) {
mail_note_folder (folder);
- camel_object_unref (folder);
+ g_object_unref (folder);
}
}
@@ -267,9 +267,8 @@ unset_folder_info(struct _folder_info *mfi, gint delete, gint unsub)
up->remove = TRUE;
up->delete = delete;
up->unsub = unsub;
- up->store = mfi->store_info->store;
+ up->store = g_object_ref (mfi->store_info->store);
up->full_name = g_strdup (mfi->full_name);
- camel_object_ref(up->store);
up->uri = g_strdup(mfi->uri);
g_queue_push_head (&updates, up);
@@ -356,12 +355,11 @@ update_1folder(struct _folder_info *mfi, gint new, const gchar *msg_uid, const g
up->full_name = g_strdup(mfi->full_name);
up->unread = unread;
up->new = new;
- up->store = mfi->store_info->store;
+ up->store = g_object_ref (mfi->store_info->store);
up->uri = g_strdup(mfi->uri);
up->msg_uid = g_strdup (msg_uid);
up->msg_sender = g_strdup (msg_sender);
up->msg_subject = g_strdup (msg_subject);
- camel_object_ref(up->store);
g_queue_push_head (&updates, up);
flush_updates();
}
@@ -390,8 +388,7 @@ setup_folder(CamelFolderInfo *fi, struct _store_info *si)
up->full_name = g_strdup(mfi->full_name);
up->uri = g_strdup(fi->uri);
up->unread = fi->unread;
- up->store = si->store;
- camel_object_ref(up->store);
+ up->store = g_object_ref (si->store);
if ((fi->flags & CAMEL_FOLDER_NOSELECT) == 0)
up->add = TRUE;
@@ -689,8 +686,7 @@ rename_folders(struct _store_info *si, const gchar *oldbase, const gchar *newbas
up->full_name = g_strdup(mfi->full_name);
up->uri = g_strdup(mfi->uri);
up->unread = fi->unread==-1?0:fi->unread;
- up->store = si->store;
- camel_object_ref(up->store);
+ up->store = g_object_ref (si->store);
if ((fi->flags & CAMEL_FOLDER_NOSELECT) == 0)
up->add = TRUE;
@@ -837,7 +833,7 @@ mail_note_store_remove(CamelStore *store)
link = g_list_next (link);
}
- camel_object_unref(si->store);
+ g_object_unref(si->store);
g_hash_table_foreach(si->folders, (GHFunc)free_folder_info_hash, NULL);
g_hash_table_destroy(si->folders);
g_hash_table_destroy(si->folders_uri);
@@ -913,7 +909,7 @@ ping_store_exec (struct _ping_store_msg *m)
static void
ping_store_free (struct _ping_store_msg *m)
{
- camel_object_unref (m->store);
+ g_object_unref (m->store);
}
static MailMsgInfo ping_store_info = {
@@ -934,8 +930,7 @@ ping_store (gpointer key, gpointer val, gpointer user_data)
return;
m = mail_msg_new (&ping_store_info);
- m->store = store;
- camel_object_ref (store);
+ m->store = g_object_ref (store);
mail_msg_slow_ordered_push (m);
}
@@ -1003,8 +998,7 @@ mail_note_store(CamelStore *store, CamelOperation *op,
si->folders = g_hash_table_new(g_str_hash, g_str_equal);
si->folders_uri = g_hash_table_new(CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->hash_folder_name,
CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->compare_folder_name);
- si->store = store;
- camel_object_ref((CamelObject *)store);
+ si->store = g_object_ref (store);
g_hash_table_insert(stores, store, si);
g_queue_init (&si->folderinfo_updates);
hook = TRUE;
@@ -1087,8 +1081,7 @@ gint mail_note_get_folder_from_uri(const gchar *uri, CamelFolder **folderp)
g_hash_table_foreach(stores, (GHFunc)storeinfo_find_folder_info, &fi);
if (folderp) {
if (fi.fi && fi.fi->folder) {
- *folderp = fi.fi->folder;
- camel_object_ref(*folderp);
+ *folderp = g_object_ref (fi.fi->folder);
} else {
*folderp = NULL;
}
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 8110ab4..61f591c 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -157,7 +157,7 @@ em_filter_folder_element_exec (struct _filter_mail_msg *m)
/* this may thaw/unref source folders, do it here so we dont do it in the main thread
see also fetch_mail_fetch() below */
- camel_object_unref(m->driver);
+ g_object_unref(m->driver);
m->driver = NULL;
if (m->cancel)
@@ -173,7 +173,7 @@ static void
em_filter_folder_element_free (struct _filter_mail_msg *m)
{
if (m->source_folder)
- camel_object_unref (m->source_folder);
+ g_object_unref (m->source_folder);
if (m->source_uids)
em_utils_uids_free (m->source_uids);
@@ -182,10 +182,10 @@ em_filter_folder_element_free (struct _filter_mail_msg *m)
camel_operation_unref (m->cancel);
if (m->destination)
- camel_object_unref (m->destination);
+ g_object_unref (m->destination);
if (m->driver)
- camel_object_unref (m->driver);
+ g_object_unref (m->driver);
mail_session_flush_filter_log ();
}
@@ -206,8 +206,7 @@ mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids,
struct _filter_mail_msg *m;
m = mail_msg_new (&em_filter_folder_element_info);
- m->source_folder = source_folder;
- camel_object_ref (source_folder);
+ m->source_folder = g_object_ref (source_folder);
m->source_uids = uids;
m->cache = NULL;
m->delete = FALSE;
@@ -281,7 +280,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m)
fm->destination = e_mail_local_get_folder (E_MAIL_FOLDER_LOCAL_INBOX);
if (fm->destination == NULL)
goto fail;
- camel_object_ref (fm->destination);
+ g_object_ref (fm->destination);
/* FIXME: this should support keep_on_server too, which would then perform a spool
access thingy, right? problem is matching raw messages to uid's etc. */
@@ -357,7 +356,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m)
/* we unref the source folder here since we
may now block in finalize (we try to
disconnect cleanly) */
- camel_object_unref (fm->source_folder);
+ g_object_unref (fm->source_folder);
fm->source_folder = NULL;
}
}
@@ -369,7 +368,7 @@ fail:
folders and whatnot) before we are really done */
/* should this be cancellable too? (i.e. above unregister above) */
if (fm->driver) {
- camel_object_unref (fm->driver);
+ g_object_unref (fm->driver);
fm->driver = NULL;
}
}
@@ -579,7 +578,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
folder = mail_tool_uri_to_folder(uri, 0, NULL);
if (folder) {
camel_folder_append_message(folder, message, info, NULL, NULL);
- camel_object_unref(folder);
+ g_object_unref(folder);
folder = NULL;
}
g_free(uri);
@@ -618,7 +617,7 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
if (!folder) {
folder = e_mail_local_get_folder (E_MAIL_FOLDER_SENT);
- camel_object_ref(folder);
+ g_object_ref(folder);
}
camel_folder_append_message (folder, message, info, NULL, ex);
@@ -639,8 +638,8 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
g_string_append_printf (err, _("Failed to append to %s: %s\n"
"Appending to local `Sent' folder instead."),
name, camel_exception_get_description (ex));
- camel_object_ref (sent_folder);
- camel_object_unref (folder);
+ g_object_ref (sent_folder);
+ g_object_unref (folder);
folder = sent_folder;
camel_exception_clear (ex);
@@ -672,19 +671,19 @@ mail_send_message (struct _send_queue_msg *m, CamelFolder *queue, const gchar *u
exit:
if (folder) {
camel_folder_sync(folder, FALSE, NULL);
- camel_object_unref(folder);
+ g_object_unref(folder);
}
if (info)
camel_message_info_free(info);
- camel_object_unref(recipients);
- camel_object_unref(from);
+ g_object_unref(recipients);
+ g_object_unref(from);
if (xport)
- camel_object_unref(xport);
+ g_object_unref(xport);
g_free(sent_folder_uri);
g_free(transport_url);
camel_header_raw_clear(&xev);
g_string_free(err, TRUE);
- camel_object_unref(message);
+ g_object_unref(message);
return;
}
@@ -808,7 +807,7 @@ send_queue_exec (struct _send_queue_msg *m)
report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete."));
if (m->driver) {
- camel_object_unref (m->driver);
+ g_object_unref (m->driver);
m->driver = NULL;
}
@@ -852,8 +851,8 @@ static void
send_queue_free (struct _send_queue_msg *m)
{
if (m->driver)
- camel_object_unref(m->driver);
- camel_object_unref(m->queue);
+ g_object_unref(m->driver);
+ g_object_unref(m->queue);
g_free(m->destination);
if (m->cancel)
camel_operation_unref(m->cancel);
@@ -878,8 +877,7 @@ mail_send_queue(CamelFolder *queue, const gchar *destination,
struct _send_queue_msg *m;
m = mail_msg_new(&send_queue_info);
- m->queue = queue;
- camel_object_ref(queue);
+ m->queue = g_object_ref (queue);
m->destination = g_strdup(destination);
if (cancel) {
m->cancel = cancel;
@@ -937,8 +935,8 @@ append_mail_done (struct _append_msg *m)
static void
append_mail_free (struct _append_msg *m)
{
- camel_object_unref(m->message);
- camel_object_unref(m->folder);
+ g_object_unref(m->message);
+ g_object_unref(m->folder);
g_free (m->appended_uid);
}
@@ -964,10 +962,8 @@ mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageIn
camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", x_mailer);
m = mail_msg_new (&append_mail_info);
- m->folder = folder;
- camel_object_ref(folder);
- m->message = message;
- camel_object_ref(message);
+ m->folder = g_object_ref (folder);
+ m->message = g_object_ref (message);
m->info = info;
m->done = done;
@@ -1009,7 +1005,7 @@ transfer_messages_exec (struct _transfer_msg *m)
return;
if (dest == m->source) {
- camel_object_unref(dest);
+ g_object_unref(dest);
/* no-op */
return;
}
@@ -1032,7 +1028,7 @@ transfer_messages_exec (struct _transfer_msg *m)
camel_folder_thaw (m->source);
camel_folder_thaw (dest);
camel_folder_sync (dest, FALSE, NULL);
- camel_object_unref (dest);
+ g_object_unref (dest);
}
static void
@@ -1045,7 +1041,7 @@ transfer_messages_done (struct _transfer_msg *m)
static void
transfer_messages_free (struct _transfer_msg *m)
{
- camel_object_unref (m->source);
+ g_object_unref (m->source);
g_free (m->dest_uri);
em_utils_uids_free (m->uids);
}
@@ -1073,8 +1069,7 @@ mail_transfer_messages (CamelFolder *source, GPtrArray *uids,
g_return_if_fail (dest_uri != NULL);
m = mail_msg_new(&transfer_messages_info);
- m->source = source;
- camel_object_ref (source);
+ m->source = g_object_ref (source);
m->uids = uids;
m->delete = delete_from_source;
m->dest_uri = g_strdup (dest_uri);
@@ -1139,7 +1134,7 @@ get_folderinfo_free (struct _get_folderinfo_msg *m)
{
if (m->info && m->can_clear)
camel_store_free_folder_info(m->store, m->info);
- camel_object_unref(m->store);
+ g_object_unref(m->store);
}
static MailMsgInfo get_folderinfo_info = {
@@ -1162,8 +1157,7 @@ mail_get_folderinfo (CamelStore *store, CamelOperation *op, gboolean (*done)(Cam
m->base.cancel = op;
camel_operation_ref(op);
}
- m->store = store;
- camel_object_ref(store);
+ m->store = g_object_ref (store);
m->done = done;
m->data = data;
id = m->base.seq;
@@ -1205,11 +1199,11 @@ do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
for (i=0;i<messages->len;i++) {
part = mail_tool_make_message_attachment(messages->pdata[i]);
camel_multipart_add_part(multipart, part);
- camel_object_unref(part);
+ g_object_unref(part);
}
part = camel_mime_part_new();
camel_medium_set_content_object(CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER(multipart));
- camel_object_unref(multipart);
+ g_object_unref(multipart);
camel_mime_part_set_description(part, _("Forwarded messages"));
}
@@ -1217,7 +1211,7 @@ do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages,
subject = mail_tool_generate_forward_subject(messages->pdata[0]);
d->done(folder, messages, part, subject, d->data);
g_free(subject);
- camel_object_unref(part);
+ g_object_unref(part);
g_free(d);
}
@@ -1273,7 +1267,7 @@ get_folder_free (struct _get_folder_msg *m)
{
g_free (m->uri);
if (m->folder)
- camel_object_unref (m->folder);
+ g_object_unref (m->folder);
}
static MailMsgInfo get_folder_info = {
@@ -1338,7 +1332,7 @@ static void
get_quota_free (struct _get_quota_msg *m)
{
if (m->folder)
- camel_object_unref (m->folder);
+ g_object_unref (m->folder);
if (m->quota)
camel_folder_quota_info_free (m->quota);
g_free (m->folder_uri);
@@ -1364,13 +1358,11 @@ mail_get_folder_quota (CamelFolder *folder,
g_return_val_if_fail (folder != NULL, -1);
m = mail_msg_new (&get_quota_info);
- m->folder = folder;
+ m->folder = g_object_ref (folder);
m->folder_uri = g_strdup (folder_uri);
m->data = data;
m->done = done;
- camel_object_ref (m->folder);
-
id = m->base.seq;
dispatch (m);
return id;
@@ -1415,7 +1407,7 @@ get_store_free (struct _get_store_msg *m)
{
g_free (m->uri);
if (m->store)
- camel_object_unref (m->store);
+ g_object_unref (m->store);
}
static MailMsgInfo get_store_info = {
@@ -1539,7 +1531,7 @@ remove_folder_done (struct _remove_folder_msg *m)
static void
remove_folder_free (struct _remove_folder_msg *m)
{
- camel_object_unref (m->folder);
+ g_object_unref (m->folder);
}
static MailMsgInfo remove_folder_info = {
@@ -1558,8 +1550,7 @@ mail_remove_folder (CamelFolder *folder, void (*done) (CamelFolder *folder, gboo
g_return_if_fail (folder != NULL);
m = mail_msg_new (&remove_folder_info);
- m->folder = folder;
- camel_object_ref (folder);
+ m->folder = g_object_ref (folder);
m->data = data;
m->done = done;
@@ -1599,7 +1590,7 @@ sync_folder_done (struct _sync_folder_msg *m)
static void
sync_folder_free (struct _sync_folder_msg *m)
{
- camel_object_unref((CamelObject *)m->folder);
+ g_object_unref((CamelObject *)m->folder);
}
static MailMsgInfo sync_folder_info = {
@@ -1616,8 +1607,7 @@ mail_sync_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpointe
struct _sync_folder_msg *m;
m = mail_msg_new(&sync_folder_info);
- m->folder = folder;
- camel_object_ref(folder);
+ m->folder = g_object_ref (folder);
m->data = data;
m->done = done;
@@ -1666,7 +1656,7 @@ sync_store_done (struct _sync_store_msg *m)
static void
sync_store_free (struct _sync_store_msg *m)
{
- camel_object_unref(m->store);
+ g_object_unref(m->store);
}
static MailMsgInfo sync_store_info = {
@@ -1683,9 +1673,8 @@ mail_sync_store(CamelStore *store, gint expunge, void (*done) (CamelStore *store
struct _sync_store_msg *m;
m = mail_msg_new(&sync_store_info);
- m->store = store;
+ m->store = g_object_ref (store);
m->expunge = expunge;
- camel_object_ref(store);
m->data = data;
m->done = done;
@@ -1724,8 +1713,7 @@ mail_refresh_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpoi
struct _sync_folder_msg *m;
m = mail_msg_new(&refresh_folder_info);
- m->folder = folder;
- camel_object_ref(folder);
+ m->folder = g_object_ref (folder);
m->data = data;
m->done = done;
@@ -1761,8 +1749,7 @@ mail_expunge_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, gpoi
struct _sync_folder_msg *m;
m = mail_msg_new(&expunge_folder_info);
- m->folder = folder;
- camel_object_ref(folder);
+ m->folder = g_object_ref (folder);
m->data = data;
m->done = done;
@@ -1804,7 +1791,7 @@ empty_trash_exec (struct _empty_trash_msg *m)
if (trash) {
camel_folder_expunge (trash, &m->base.ex);
- camel_object_unref (trash);
+ g_object_unref (trash);
}
}
@@ -1884,11 +1871,11 @@ static void
get_message_free (struct _get_message_msg *m)
{
g_free (m->uid);
- camel_object_unref (m->folder);
+ g_object_unref (m->folder);
camel_operation_unref (m->cancel);
if (m->message)
- camel_object_unref (m->message);
+ g_object_unref (m->message);
}
static MailMsgInfo get_message_info = {
@@ -1908,8 +1895,7 @@ mail_get_message(CamelFolder *folder, const gchar *uid, void (*done) (CamelFolde
gint id;
m = mail_msg_new(&get_message_info);
- m->folder = folder;
- camel_object_ref(folder);
+ m->folder = g_object_ref (folder);
m->uid = g_strdup(uid);
m->data = data;
m->done = (void (*) (CamelFolder *, const gchar *, CamelMimeMessage *, gpointer )) done;
@@ -1950,8 +1936,7 @@ mail_get_messagex(CamelFolder *folder, const gchar *uid, void (*done) (CamelFold
gint id;
m = mail_msg_new(&get_messagex_info);
- m->folder = folder;
- camel_object_ref(folder);
+ m->folder = g_object_ref (folder);
m->uid = g_strdup(uid);
m->data = data;
m->done = (void (*) (CamelFolder *, const gchar *, CamelMimeMessage *, gpointer )) done;
@@ -2017,10 +2002,10 @@ get_messages_free (struct _get_messages_msg *m)
em_utils_uids_free (m->uids);
for (i=0;i<m->messages->len;i++) {
if (m->messages->pdata[i])
- camel_object_unref(m->messages->pdata[i]);
+ g_object_unref(m->messages->pdata[i]);
}
g_ptr_array_free(m->messages, TRUE);
- camel_object_unref(m->folder);
+ g_object_unref(m->folder);
}
static MailMsgInfo get_messages_info = {
@@ -2040,8 +2025,7 @@ mail_get_messages(CamelFolder *folder, GPtrArray *uids,
gint id;
m = mail_msg_new(&get_messages_info);
- m->folder = folder;
- camel_object_ref(folder);
+ m->folder = g_object_ref (folder);
m->uids = uids;
m->messages = g_ptr_array_new();
m->data = data;
@@ -2123,7 +2107,7 @@ save_messages_exec (struct _save_messages_msg *m)
from_filter = camel_mime_filter_from_new();
filtered_stream = camel_stream_filter_new_with_stream(stream);
camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)from_filter);
- camel_object_unref(from_filter);
+ g_object_unref(from_filter);
if (path != m->path)
g_free (path);
@@ -2150,15 +2134,15 @@ save_messages_exec (struct _save_messages_msg *m)
camel_exception_setv(&m->base.ex, CAMEL_EXCEPTION_SYSTEM,
_("Error saving messages to: %s:\n %s"), m->path, g_strerror(errno));
g_free(from);
- camel_object_unref((CamelObject *)message);
+ g_object_unref((CamelObject *)message);
break;
}
g_free(from);
- camel_object_unref(message);
+ g_object_unref(message);
}
- camel_object_unref(filtered_stream);
- camel_object_unref(stream);
+ g_object_unref(filtered_stream);
+ g_object_unref(stream);
}
static void
@@ -2172,7 +2156,7 @@ static void
save_messages_free (struct _save_messages_msg *m)
{
em_utils_uids_free (m->uids);
- camel_object_unref(m->folder);
+ g_object_unref(m->folder);
g_free(m->path);
}
@@ -2192,8 +2176,7 @@ mail_save_messages(CamelFolder *folder, GPtrArray *uids, const gchar *path,
gint id;
m = mail_msg_new(&save_messages_info);
- m->folder = folder;
- camel_object_ref(folder);
+ m->folder = g_object_ref (folder);
m->uids = uids;
m->path = g_strdup(path);
m->data = data;
@@ -2264,7 +2247,7 @@ save_part_exec (struct _save_part_msg *m)
_("Could not write data: %s"),
g_strerror (errno));
- camel_object_unref (stream);
+ g_object_unref (stream);
}
static void
@@ -2277,7 +2260,7 @@ save_part_done (struct _save_part_msg *m)
static void
save_part_free (struct _save_part_msg *m)
{
- camel_object_unref (m->part);
+ g_object_unref (m->part);
g_free (m->path);
}
@@ -2296,8 +2279,7 @@ mail_save_part (CamelMimePart *part, const gchar *path,
struct _save_part_msg *m;
gint id;
m = mail_msg_new (&save_part_info);
- m->part = part;
- camel_object_ref (part);
+ m->part = g_object_ref (part);
m->path = g_strdup (path);
m->data = data;
m->done = done;
@@ -2340,7 +2322,7 @@ prep_offline_exec (struct _prep_offline_msg *m)
/* prepare_for_offline should do this? */
/* of course it should all be atomic, but ... */
camel_folder_sync(folder, FALSE, NULL);
- camel_object_unref(folder);
+ g_object_unref(folder);
}
if (m->cancel)
@@ -2456,7 +2438,7 @@ set_offline_done (struct _set_offline_msg *m)
static void
set_offline_free (struct _set_offline_msg *m)
{
- camel_object_unref(m->store);
+ g_object_unref(m->store);
}
static MailMsgInfo set_offline_info = {
@@ -2482,8 +2464,7 @@ mail_store_set_offline (CamelStore *store, gboolean offline,
camel_service_cancel_connect (CAMEL_SERVICE (store));
m = mail_msg_new(&set_offline_info);
- m->store = store;
- camel_object_ref(store);
+ m->store = g_object_ref (store);
m->offline = offline;
m->data = data;
m->done = done;
@@ -2530,7 +2511,7 @@ prepare_offline_done (struct _set_offline_msg *m)
static void
prepare_offline_free (struct _set_offline_msg *m)
{
- camel_object_unref (m->store);
+ g_object_unref (m->store);
}
static MailMsgInfo prepare_offline_info = {
@@ -2552,8 +2533,7 @@ mail_store_prepare_offline (CamelStore *store)
*/
m = mail_msg_new(&prepare_offline_info);
- m->store = store;
- camel_object_ref(store);
+ m->store = g_object_ref (store);
m->data = NULL;
m->done = NULL;
@@ -2603,7 +2583,7 @@ check_service_exec (struct _check_msg *m)
}
m->authtypes = camel_service_query_auth_types(service, &m->base.ex);
- camel_object_unref(service);
+ g_object_unref(service);
}
static void
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 1495f09..36b3632 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -138,7 +138,7 @@ free_folder_info(struct _folder_info *info)
{
/*camel_folder_thaw (info->folder); */
mail_sync_folder(info->folder, NULL, NULL);
- camel_object_unref(info->folder);
+ g_object_unref(info->folder);
g_free(info->uri);
g_free(info);
}
@@ -170,7 +170,7 @@ setup_send_data(void)
(GDestroyNotify) free_folder_info);
data->inbox = e_mail_local_get_folder (
E_MAIL_FOLDER_LOCAL_INBOX);
- camel_object_ref(data->inbox);
+ g_object_ref(data->inbox);
data->active = g_hash_table_new_full (
g_str_hash, g_str_equal,
(GDestroyNotify) NULL,
@@ -204,7 +204,7 @@ free_send_data(void)
if (data->inbox) {
mail_sync_folder(data->inbox, NULL, NULL);
/*camel_folder_thaw (data->inbox); */
- camel_object_unref(data->inbox);
+ g_object_unref(data->inbox);
}
g_list_free(data->infos);
@@ -802,10 +802,8 @@ receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelE
g_mutex_lock(info->data->lock);
oldinfo = g_hash_table_lookup(info->data->folders, uri);
g_mutex_unlock(info->data->lock);
- if (oldinfo) {
- camel_object_ref(oldinfo->folder);
- return oldinfo->folder;
- }
+ if (oldinfo)
+ return g_object_ref (oldinfo->folder);
folder = mail_tool_uri_to_folder (uri, 0, ex);
if (!folder)
return NULL;
@@ -816,7 +814,7 @@ receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelE
if (g_hash_table_lookup_extended (info->data->folders, uri, &oldkey, &oldinfoptr)) {
oldinfo = (struct _folder_info *) oldinfoptr;
- camel_object_unref(oldinfo->folder);
+ g_object_unref(oldinfo->folder);
oldinfo->folder = folder;
} else {
/*camel_folder_freeze (folder); */
@@ -826,11 +824,9 @@ receive_get_folder(CamelFilterDriver *d, const gchar *uri, gpointer data, CamelE
g_hash_table_insert(info->data->folders, oldinfo->uri, oldinfo);
}
- camel_object_ref (folder);
-
g_mutex_unlock(info->data->lock);
- return folder;
+ return g_object_ref (folder);
}
/* ********************************************************************** */
@@ -890,7 +886,7 @@ refresh_folders_exec (struct _refresh_folders_msg *m)
camel_exception_clear(&ex);
camel_folder_refresh_info(folder, &ex);
camel_exception_clear(&ex);
- camel_object_unref(folder);
+ g_object_unref(folder);
} else if (camel_exception_is_set(&ex)) {
g_warning ("Failed to refresh folders: %s", camel_exception_get_description (&ex));
camel_exception_clear (&ex);
@@ -917,7 +913,7 @@ refresh_folders_free (struct _refresh_folders_msg *m)
g_ptr_array_free(m->folders, TRUE);
camel_store_free_folder_info (m->store, m->finfo);
- camel_object_unref(m->store);
+ g_object_unref(m->store);
}
static MailMsgInfo refresh_folders_info = {
@@ -937,8 +933,7 @@ receive_update_got_folderinfo(CamelStore *store, CamelFolderInfo *info, gpointer
struct _send_info *sinfo = data;
m = mail_msg_new(&refresh_folders_info);
- m->store = store;
- camel_object_ref(store);
+ m->store = g_object_ref (store);
m->folders = folders;
m->info = sinfo;
m->finfo = info;
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 14aec15..d0b321e 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -413,7 +413,7 @@ lookup_addressbook(CamelSession *session, const gchar *name)
addr = camel_internet_address_new ();
camel_address_decode ((CamelAddress *)addr, name);
ret = em_utils_in_addressbook (addr, mail_config_get_lookup_book_local_only ());
- camel_object_unref (addr);
+ g_object_unref (addr);
return ret;
}
@@ -474,7 +474,7 @@ main_play_sound (CamelFilterDriver *driver, gchar *filename, gpointer user_data)
gdk_beep ();
g_free (filename);
- camel_object_unref (session);
+ g_object_unref (session);
}
static void
@@ -482,7 +482,7 @@ session_play_sound (CamelFilterDriver *driver, const gchar *filename, gpointer u
{
MailSession *ms = (MailSession *) session;
- camel_object_ref (session);
+ g_object_ref (session);
mail_async_event_emit (ms->async, MAIL_ASYNC_GUI, (MailAsyncFunc) main_play_sound,
driver, g_strdup (filename), user_data);
@@ -492,7 +492,7 @@ static void
main_system_beep (CamelFilterDriver *driver, gpointer user_data)
{
gdk_beep ();
- camel_object_unref (session);
+ g_object_unref (session);
}
static void
@@ -500,7 +500,7 @@ session_system_beep (CamelFilterDriver *driver, gpointer user_data)
{
MailSession *ms = (MailSession *) session;
- camel_object_ref (session);
+ g_object_ref (session);
mail_async_event_emit (ms->async, MAIL_ASYNC_GUI, (MailAsyncFunc) main_system_beep,
driver, user_data, NULL);
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 1403605..890bebf 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -71,7 +71,7 @@ mail_tool_get_inbox (const gchar *url, CamelException *ex)
return NULL;
folder = camel_store_get_inbox (store, ex);
- camel_object_unref (store);
+ g_object_unref (store);
return folder;
}
@@ -109,7 +109,7 @@ mail_tool_get_trash (const gchar *url, gint connect, CamelException *ex)
else
trash = NULL;
- camel_object_unref (store);
+ g_object_unref (store);
return trash;
}
@@ -345,7 +345,7 @@ mail_tool_uri_to_folder (const gchar *uri, guint32 flags, CamelException *ex)
folder = camel_store_get_junk (store, ex);
} else
folder = camel_store_get_folder (store, name, flags, ex);
- camel_object_unref (store);
+ g_object_unref (store);
}
if (folder)
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 9fed827..20b8c72 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -115,7 +115,7 @@ vfolder_setup_exec (struct _setup_msg *m)
l = m->sources_folder;
while (l && !shutdown) {
d(printf(" Adding folder: %s\n", ((CamelFolder *)l->data)->full_name));
- camel_object_ref(l->data);
+ g_object_ref(l->data);
list = g_list_append(list, l->data);
l = l->next;
}
@@ -125,7 +125,7 @@ vfolder_setup_exec (struct _setup_msg *m)
l = list;
while (l) {
- camel_object_unref(l->data);
+ g_object_unref(l->data);
l = l->next;
}
g_list_free(list);
@@ -141,7 +141,7 @@ vfolder_setup_free (struct _setup_msg *m)
{
GList *l;
- camel_object_unref(m->folder);
+ g_object_unref(m->folder);
g_free(m->query);
l = m->sources_uri;
@@ -153,7 +153,7 @@ vfolder_setup_free (struct _setup_msg *m)
l = m->sources_folder;
while (l) {
- camel_object_unref(l->data);
+ g_object_unref(l->data);
l = l->next;
}
g_list_free(m->sources_folder);
@@ -175,8 +175,7 @@ vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList
gint id;
m = mail_msg_new(&vfolder_setup_info);
- m->folder = folder;
- camel_object_ref(folder);
+ m->folder = g_object_ref (folder);
m->query = g_strdup(query);
m->sources_uri = sources_uri;
m->sources_folder = sources_folder;
@@ -272,7 +271,7 @@ vfolder_adduri_exec (struct _adduri_msg *m)
camel_vee_folder_add_folder((CamelVeeFolder *)l->data, folder);
l = l->next;
}
- camel_object_unref(folder);
+ g_object_unref(folder);
}
}
@@ -284,7 +283,7 @@ vfolder_adduri_done(struct _adduri_msg *m)
static void
vfolder_adduri_free (struct _adduri_msg *m)
{
- g_list_foreach(m->folders, (GFunc)camel_object_unref, NULL);
+ g_list_foreach(m->folders, (GFunc)g_object_unref, NULL);
g_list_free(m->folders);
g_free(m->uri);
}
@@ -509,7 +508,7 @@ mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove)
g_warning ("vf is NULL for %s\n", rule->name);
continue;
}
- camel_object_ref(vf);
+ g_object_ref(vf);
folders = g_list_prepend(folders, vf);
}
}
@@ -809,7 +808,7 @@ static void context_rule_removed(ERuleContext *ctx, EFilterRule *rule)
camel_store_delete_folder(vfolder_store, rule->name, NULL);
/* this must be unref'd after its deleted */
if (folder)
- camel_object_unref ((CamelFolder *) folder);
+ g_object_unref ((CamelFolder *) folder);
}
static void
@@ -1217,7 +1216,7 @@ vfolder_foreach_cb (gpointer key, gpointer data, gpointer user_data)
CamelFolder *folder = CAMEL_FOLDER (data);
if (folder)
- camel_object_unref(folder);
+ g_object_unref(folder);
g_free (key);
}
@@ -1234,7 +1233,7 @@ mail_vfolder_shutdown (void)
}
if (vfolder_store) {
- camel_object_unref (vfolder_store);
+ g_object_unref (vfolder_store);
vfolder_store = NULL;
}
diff --git a/mail/message-list.c b/mail/message-list.c
index 90c0812..d9af8a5 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -264,7 +264,7 @@ e_mail_address_new (const gchar *address)
cia = camel_internet_address_new ();
if (camel_address_unformat (CAMEL_ADDRESS (cia), address) == -1) {
- camel_object_unref (cia);
+ g_object_unref (cia);
return NULL;
}
camel_internet_address_get (cia, 0, &name, &addr);
@@ -277,7 +277,7 @@ e_mail_address_new (const gchar *address)
new->wname = NULL;
}
- camel_object_unref (cia);
+ g_object_unref (cia);
return new;
}
@@ -500,7 +500,7 @@ clear_selection(MessageList *ml, struct _MLSelection *selection)
selection->uids = NULL;
}
if (selection->folder) {
- camel_object_unref(selection->folder);
+ g_object_unref(selection->folder);
selection->folder = NULL;
}
g_free(selection->folder_uri);
@@ -841,8 +841,7 @@ message_list_copy(MessageList *ml, gboolean cut)
}
p->clipboard.uids = uids;
- p->clipboard.folder = ml->folder;
- camel_object_ref(p->clipboard.folder);
+ p->clipboard.folder = g_object_ref (ml->folder);
p->clipboard.folder_uri = g_strdup(ml->folder_uri);
gtk_selection_owner_set(p->invisible, GDK_SELECTION_CLIPBOARD, gtk_get_current_event_time());
} else {
@@ -2115,7 +2114,7 @@ static void
ml_drop_async_free (struct _drop_msg *m)
{
g_object_unref(m->context);
- camel_object_unref(m->folder);
+ g_object_unref(m->folder);
g_free(m->selection->data);
g_free(m->selection);
@@ -2151,8 +2150,7 @@ ml_tree_drag_data_received (ETree *tree, gint row, ETreePath path, gint col,
m = mail_msg_new(&ml_drop_async_info);
m->context = context;
g_object_ref(context);
- m->folder = ml->folder;
- camel_object_ref(m->folder);
+ m->folder = g_object_ref (ml->folder);
m->action = context->action;
m->info = info;
@@ -2355,7 +2353,7 @@ message_list_destroy(GtkObject *object)
}
camel_object_unhook_event(message_list->folder, "folder_changed", folder_changed, message_list);
- camel_object_unref (message_list->folder);
+ g_object_unref (message_list->folder);
message_list->folder = NULL;
}
@@ -3475,7 +3473,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g
if (message_list->folder) {
camel_object_unhook_event((CamelObject *)message_list->folder, "folder_changed",
folder_changed, message_list);
- camel_object_unref (message_list->folder);
+ g_object_unref (message_list->folder);
message_list->folder = NULL;
}
@@ -3499,8 +3497,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const g
gint strikeout_col = -1;
ECell *cell;
- camel_object_ref (folder);
- message_list->folder = folder;
+ message_list->folder = g_object_ref (folder);
message_list->just_set_folder = TRUE;
/* Setup the strikeout effect for non-trash folders */
@@ -4609,7 +4606,7 @@ regen_list_free (struct _regen_list_msg *m)
g_free (m->search);
g_free (m->hideexpr);
- camel_object_unref (m->folder);
+ g_object_unref (m->folder);
if (m->changes)
camel_folder_change_info_free (m->changes);
@@ -4715,7 +4712,7 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca
#endif
m = mail_msg_new (®en_list_info);
- m->ml = ml;
+ m->ml = g_object_ref (ml);
m->search = g_strdup (search);
m->hideexpr = g_strdup (hideexpr);
m->changes = changes;
@@ -4723,9 +4720,7 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca
m->hidedel = ml->hidedeleted;
m->hidejunk = ml->hidejunk;
m->thread_subject = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/thread_subject", NULL);
- g_object_ref(ml);
- m->folder = ml->folder;
- camel_object_ref(m->folder);
+ m->folder = g_object_ref (ml->folder);
m->last_row = -1;
m->expand_state = NULL;
diff --git a/modules/addressbook/eab-composer-util.c b/modules/addressbook/eab-composer-util.c
index a54f5fb..968a6b3 100644
--- a/modules/addressbook/eab-composer-util.c
+++ b/modules/addressbook/eab-composer-util.c
@@ -150,7 +150,7 @@ eab_send_as_attachment (GList *destinations)
camel_mime_part_set_disposition (attachment, "attachment");
e_msg_composer_attach (composer, attachment);
- camel_object_unref (attachment);
+ g_object_unref (attachment);
if (destinations->next != NULL)
e_composer_header_table_set_subject (
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index dd95cc5..b02ad72 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -81,7 +81,7 @@ attachment_handler_get_component (EAttachment *attachment)
camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer);
wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
camel_data_wrapper_decode_to_stream (wrapper, stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
component = e_cal_util_parse_ics_string ((gchar *) buffer->data);
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 91fe5d3..01f53c8 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -207,8 +207,8 @@ mail_attachment_handler_message_rfc822 (EAttachmentView *view,
success = TRUE;
exit:
- camel_object_unref (message);
- camel_object_unref (stream);
+ g_object_unref (message);
+ g_object_unref (stream);
gtk_drag_finish (drag_context, success, FALSE, time);
}
@@ -296,7 +296,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
e_attachment_load_handle_error, parent);
g_object_unref (attachment);
- camel_object_unref (message);
+ g_object_unref (message);
goto exit;
}
@@ -311,7 +311,7 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
message = camel_folder_get_message (
folder, uids->pdata[ii], &ex);
if (message == NULL) {
- camel_object_unref (multipart);
+ g_object_unref (multipart);
goto exit;
}
@@ -322,9 +322,9 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
CAMEL_MEDIUM (mime_part), wrapper);
camel_mime_part_set_content_type (mime_part, "message/rfc822");
camel_multipart_add_part (multipart, mime_part);
- camel_object_unref (mime_part);
+ g_object_unref (mime_part);
- camel_object_unref (message);
+ g_object_unref (message);
}
mime_part = camel_mime_part_new ();
@@ -344,8 +344,8 @@ mail_attachment_handler_x_uid_list (EAttachmentView *view,
e_attachment_load_handle_error, parent);
g_object_unref (attachment);
- camel_object_unref (mime_part);
- camel_object_unref (multipart);
+ g_object_unref (mime_part);
+ g_object_unref (multipart);
exit:
if (camel_exception_is_set (&ex)) {
@@ -373,7 +373,7 @@ exit:
}
if (folder != NULL)
- camel_object_unref (folder);
+ g_object_unref (folder);
g_ptr_array_free (uids, TRUE);
diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c
index 7bc10ca..6abeaa2 100644
--- a/modules/mail/e-mail-shell-migrate.c
+++ b/modules/mail/e-mail-shell-migrate.c
@@ -1710,7 +1710,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *
camel_folder_append_message (new_folder, message, info, NULL, &ex);
camel_folder_free_message_info (old_folder, info);
- camel_object_unref (message);
+ g_object_unref (message);
if (camel_exception_is_set (&ex))
break;
@@ -1730,11 +1730,11 @@ fatal:
g_string_free(src, TRUE);
g_string_free(dest, TRUE);
if (local_store)
- camel_object_unref(local_store);
+ g_object_unref(local_store);
if (old_folder)
- camel_object_unref(old_folder);
+ g_object_unref(old_folder);
if (new_folder)
- camel_object_unref(new_folder);
+ g_object_unref(new_folder);
if (camel_exception_is_set (&ex)) {
g_set_error (
@@ -2541,7 +2541,7 @@ em_migrate_1_4 (const gchar *data_dir, xmlDocPtr filters, xmlDocPtr vfolders, GE
_("Failed to create local mail storage "
"`%s': %s"), path + 5, g_strerror (errno));
g_free (session->srcdir);
- camel_object_unref (session);
+ g_object_unref (session);
g_free (path);
return FALSE;
}
@@ -2555,7 +2555,7 @@ em_migrate_1_4 (const gchar *data_dir, xmlDocPtr filters, xmlDocPtr vfolders, GE
_("Failed to create local mail storage `%s': %s"),
path, lex.desc);
g_free (session->srcdir);
- camel_object_unref (session);
+ g_object_unref (session);
camel_exception_clear (&lex);
g_free (path);
return FALSE;
@@ -2565,10 +2565,10 @@ em_migrate_1_4 (const gchar *data_dir, xmlDocPtr filters, xmlDocPtr vfolders, GE
if (!em_migrate_local_folders_1_4 (session, error))
return FALSE;
- camel_object_unref (session->store);
+ g_object_unref (session->store);
g_free (session->srcdir);
- camel_object_unref (session);
+ g_object_unref (session);
em_upgrade_accounts_1_4();
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 1434951..d6e8fd6 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -58,7 +58,7 @@ e_mail_shell_settings_init (EShell *shell)
NULL,
G_PARAM_READWRITE));
- camel_object_ref (session);
+ g_object_ref (session);
e_shell_settings_set_pointer (
shell_settings, "mail-session", session);
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 9de5512..3228ae0 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -78,7 +78,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) {
@@ -208,7 +208,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob
data = camel_medium_get_content_object (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"));
@@ -297,8 +297,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);
- pobj->part = t->part;
+ pobj->part = g_object_ref (t->part);
pobj->filename = NULL;
pobj->playbin = NULL;
pobj->play_button = NULL;
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 6d315da..202c563 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -99,10 +99,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"));
@@ -111,7 +111,7 @@ init_db (void)
}
pipe_to_bogofilter (msg, argv, NULL);
- camel_object_unref (msg);
+ g_object_unref (msg);
}
@@ -171,7 +171,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 d1edff3..f864649 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -138,7 +138,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);
}
}
@@ -153,7 +153,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);
}
@@ -176,8 +176,7 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg)
uri = em_folder_tree_get_selected_uri(folder_tree);
em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri);
g_free(uri);
- accept_data->msg = msg;
- camel_object_ref(msg);
+ accept_data->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);
@@ -241,8 +240,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);
@@ -252,7 +251,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
} else
g_warning ("Could not get the sender name");
- camel_object_unref(content);
+ g_object_unref(content);
}
}
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 7e2aea3..9d7427e 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -710,7 +710,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 14e3b0e..2cda1ab 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -91,7 +91,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
@@ -176,7 +176,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);
@@ -222,8 +222,7 @@ create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct
}
m = mail_msg_new (&create_folder_info);
- camel_object_ref (store);
- m->store = store;
+ m->store = g_object_ref (store);
m->full_name = g_strdup (full_name);
m->parent = g_strdup (parent);
m->name = g_strdup (name);
@@ -264,7 +263,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;
}
@@ -284,7 +283,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
@@ -328,7 +327,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/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 32fdf23..2e413fe 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2546,7 +2546,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
puri->vcalendar = NULL;
else
puri->vcalendar = g_strndup ((gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
- camel_object_unref (mem);
+ g_object_unref (mem);
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 5c373d8..7163c6a 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -211,7 +211,7 @@ set_description (ECalComponent *comp, CamelMimeMessage *message)
camel_data_wrapper_decode_to_stream (content, mem);
str = g_strndup ((const gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
- camel_object_unref (mem);
+ g_object_unref (mem);
/* 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 f89b2da..6fa4801 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -671,7 +671,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;
}
@@ -708,7 +708,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 = '/';
}
}
@@ -716,7 +716,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);
@@ -808,7 +808,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);
@@ -836,7 +836,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) {
@@ -845,7 +845,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);
}
}
@@ -876,7 +876,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) {
@@ -884,14 +884,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);
}
}
@@ -921,7 +921,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);
@@ -1247,18 +1247,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 c0b5989..d37bb4e 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -194,7 +194,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]);
@@ -209,7 +209,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 c3e1ff2..efdbd14 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -519,7 +519,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
@@ -610,7 +610,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);
@@ -625,7 +625,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,
@@ -633,11 +633,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 3e537e1..c17b57d 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -105,10 +105,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);
@@ -150,13 +150,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_object((CamelMedium *)part, content);
- camel_object_unref(content);
+ g_object_unref(content);
type = em_format_snoop_type(part);
if (type)
@@ -181,7 +181,7 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
g_string_truncate(t->format->part_id, len);
- camel_object_unref(mainpart);
+ g_object_unref(mainpart);
goto ok;
fail:
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 0aafc8c..5cd0bff 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -104,8 +104,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
@@ -280,7 +280,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);
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index 0ded393..9d3771a 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -130,7 +130,7 @@ account_combo_box_test_account (EAccount *account)
camel_session, url, CAMEL_PROVIDER_STORE, &ex));
if (store != NULL) {
writable = (store->mode & CAMEL_STORE_WRITE);
- camel_object_unref (store);
+ g_object_unref (store);
}
camel_exception_clear (&ex);
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index 715018c..bd04a27 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -463,7 +463,7 @@ attachment_view_text_calendar (EAttachmentView *view,
e_attachment_load_handle_error, parent);
g_object_unref (attachment);
- camel_object_unref (mime_part);
+ g_object_unref (mime_part);
gtk_drag_finish (drag_context, TRUE, FALSE, time);
}
@@ -519,7 +519,7 @@ attachment_view_text_x_vcard (EAttachmentView *view,
e_attachment_load_handle_error, parent);
g_object_unref (attachment);
- camel_object_unref (mime_part);
+ g_object_unref (mime_part);
gtk_drag_finish (drag_context, TRUE, FALSE, time);
}
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 1fec792..75ed353 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -670,7 +670,7 @@ attachment_dispose (GObject *object)
}
if (priv->mime_part != NULL) {
- camel_object_unref (priv->mime_part);
+ g_object_unref (priv->mime_part);
priv->mime_part = NULL;
}
@@ -999,7 +999,7 @@ e_attachment_new_for_message (CamelMimeMessage *message)
attachment = e_attachment_new ();
e_attachment_set_mime_part (attachment, mime_part);
- camel_object_unref (mime_part);
+ g_object_unref (mime_part);
return attachment;
}
@@ -1049,14 +1049,14 @@ e_attachment_add_to_multipart (EAttachment *attachment,
filtered_stream, CAMEL_MIME_FILTER (filter));
camel_data_wrapper_decode_to_stream (
wrapper, CAMEL_STREAM (filtered_stream));
- camel_object_unref (filtered_stream);
- camel_object_unref (stream);
+ g_object_unref (filtered_stream);
+ g_object_unref (stream);
/* Retrieve the best encoding from the filter. */
encoding = camel_mime_filter_bestenc_get_best_encoding (
filter, CAMEL_BESTENC_8BIT);
camel_mime_part_set_encoding (mime_part, encoding);
- camel_object_unref (filter);
+ g_object_unref (filter);
if (encoding == CAMEL_TRANSFER_ENCODING_7BIT) {
/* The text fits within us-ascii, so this is safe.
@@ -1196,11 +1196,11 @@ e_attachment_set_mime_part (EAttachment *attachment,
if (mime_part != NULL) {
g_return_if_fail (CAMEL_IS_MIME_PART (mime_part));
- camel_object_ref (mime_part);
+ g_object_ref (mime_part);
}
if (attachment->priv->mime_part != NULL)
- camel_object_unref (attachment->priv->mime_part);
+ g_object_unref (attachment->priv->mime_part);
attachment->priv->mime_part = mime_part;
@@ -1530,12 +1530,12 @@ attachment_load_finish (LoadContext *load_context)
camel_data_wrapper_construct_from_stream (wrapper, stream);
camel_data_wrapper_set_mime_type (wrapper, mime_type);
camel_stream_close (stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
mime_part = camel_mime_part_new ();
camel_medium_set_content_object (CAMEL_MEDIUM (mime_part), wrapper);
- camel_object_unref (wrapper);
+ g_object_unref (wrapper);
g_free (mime_type);
display_name = g_file_info_get_display_name (file_info);
@@ -1558,7 +1558,7 @@ attachment_load_finish (LoadContext *load_context)
}
g_simple_async_result_set_op_res_gpointer (
- simple, mime_part, (GDestroyNotify) camel_object_unref);
+ simple, mime_part, (GDestroyNotify) g_object_unref);
g_simple_async_result_complete (simple);
@@ -1793,10 +1793,9 @@ attachment_load_from_mime_part (LoadContext *load_context)
simple = load_context->simple;
load_context->simple = NULL;
- camel_object_ref (mime_part);
g_simple_async_result_set_op_res_gpointer (
- simple, mime_part,
- (GDestroyNotify) camel_object_unref);
+ simple, g_object_ref (mime_part),
+ (GDestroyNotify) g_object_unref);
g_simple_async_result_complete_in_idle (simple);
attachment_load_context_free (load_context);
@@ -2467,7 +2466,7 @@ attachment_save_got_output_stream (SaveContext *save_context)
camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer);
wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
camel_data_wrapper_decode_to_stream (wrapper, stream);
- camel_object_unref (stream);
+ g_object_unref (stream);
/* Load the buffer into a GMemoryInputStream.
* But watch out for zero length MIME parts. */
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index f52d739..21b2e2d 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -285,7 +285,7 @@ action_mailto_copy_cb (GtkAction *action,
if (text == NULL || *text == '\0')
text = g_strdup (uri + strlen ("mailto:";));
- camel_object_unref (inet_addr);
+ g_object_unref (inet_addr);
camel_url_free (curl);
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
@@ -726,7 +726,7 @@ web_view_on_url (GtkHTML *html,
address = camel_internet_address_new ();
camel_address_decode (CAMEL_ADDRESS (address), curl->path);
who = camel_address_format (CAMEL_ADDRESS (address));
- camel_object_unref (address);
+ g_object_unref (address);
camel_url_free (curl);
if (who == NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
