From bc90469e7f3bfd31dc6530c2d1ba1cc519a8a3a7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 23 Apr 2010 10:28:53 -0400 Subject: Camel is now GObject-based. --- modules/mail/e-mail-attachment-handler.c | 18 +++++++++--------- modules/mail/e-mail-shell-settings.c | 2 +- modules/mail/e-mail-shell-view-private.c | 4 ++-- modules/mail/e-mail-shell-view.c | 14 +++++++------- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'modules/mail') 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; } -- cgit v1.2.3