aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-04-23 22:28:53 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-04-24 23:05:27 +0800
commitbc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7 (patch)
treef5d0cc91fc1568431e0b457406a9b3ea21157e0e /modules
parentf862e946b83d5f70001c3d81290ecc8a0d8ca2a0 (diff)
downloadgsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar
gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.gz
gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.bz2
gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.lz
gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.xz
gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.tar.zst
gsoc2013-evolution-bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7.zip
Camel is now GObject-based.
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/eab-composer-util.c2
-rw-r--r--modules/calendar/e-cal-attachment-handler.c2
-rw-r--r--modules/mail/e-mail-attachment-handler.c18
-rw-r--r--modules/mail/e-mail-shell-settings.c2
-rw-r--r--modules/mail/e-mail-shell-view-private.c4
-rw-r--r--modules/mail/e-mail-shell-view.c14
6 files changed, 21 insertions, 21 deletions
diff --git a/modules/addressbook/eab-composer-util.c b/modules/addressbook/eab-composer-util.c
index a54f5fbf7d..968a6b3c06 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 c368f7347c..ce88a18267 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 (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 ee49490f31..790f4336a8 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -205,8 +205,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);
}
@@ -294,7 +294,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;
}
@@ -309,7 +309,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;
}
@@ -320,9 +320,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 ();
@@ -342,8 +342,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)) {
@@ -371,7 +371,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-settings.c b/modules/mail/e-mail-shell-settings.c
index 1434951b81..d6e8fd698b 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/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 8a5eceac4d..5c60071d15 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -625,12 +625,12 @@ e_mail_shell_view_private_dispose (EMailShellView *mail_shell_view)
DISPOSE (priv->search_rules[ii]);
if (priv->search_account_all != NULL) {
- camel_object_unref (priv->search_account_all);
+ g_object_unref (priv->search_account_all);
priv->search_account_all = NULL;
}
if (priv->search_account_current != NULL) {
- camel_object_unref (priv->search_account_current);
+ g_object_unref (priv->search_account_current);
priv->search_account_current = NULL;
}
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index c3429859f7..acfcbdfb7d 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -62,12 +62,12 @@ search_results_exec (SearchResultsMsg *msg)
camel_operation_register (msg->cancel);
copied_list = g_list_copy (msg->folder_list);
- g_list_foreach (copied_list, (GFunc) camel_object_ref, NULL);
+ g_list_foreach (copied_list, (GFunc) g_object_ref, NULL);
camel_vee_folder_set_folders (
CAMEL_VEE_FOLDER (msg->folder), copied_list);
- g_list_foreach (copied_list, (GFunc) camel_object_unref, NULL);
+ g_list_foreach (copied_list, (GFunc) g_object_unref, NULL);
g_list_free (copied_list);
}
@@ -79,9 +79,9 @@ search_results_done (SearchResultsMsg *msg)
static void
search_results_free (SearchResultsMsg *msg)
{
- camel_object_unref (msg->folder);
+ g_object_unref (msg->folder);
- g_list_foreach (msg->folder_list, (GFunc) camel_object_unref, NULL);
+ g_list_foreach (msg->folder_list, (GFunc) g_object_unref, NULL);
g_list_free (msg->folder_list);
}
@@ -101,7 +101,7 @@ mail_shell_view_setup_search_results_folder (CamelFolder *folder,
SearchResultsMsg *msg;
gint id;
- camel_object_ref (folder);
+ g_object_ref (folder);
msg = mail_msg_new (&search_results_setup_info);
msg->folder = folder;
@@ -487,7 +487,7 @@ all_accounts:
text = e_shell_searchbar_get_search_text (searchbar);
if (text == NULL || *text == '\0') {
if (priv->search_account_all != NULL) {
- camel_object_unref (priv->search_account_all);
+ g_object_unref (priv->search_account_all);
priv->search_account_all = NULL;
}
@@ -614,7 +614,7 @@ current_account:
text = e_shell_searchbar_get_search_text (searchbar);
if (text == NULL || *text == '\0') {
if (priv->search_account_current != NULL) {
- camel_object_unref (priv->search_account_current);
+ g_object_unref (priv->search_account_current);
priv->search_account_current = NULL;
}