From 5310e4a0b10ded4c77ce9dfaff49d3e99e327462 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Sep 2010 23:16:38 -0400 Subject: Adapt to CamelOperation API changes. --- modules/mail/e-mail-shell-view-private.c | 2 +- modules/mail/e-mail-shell-view.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/mail') diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 907eb18259..58ef47a1a8 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -730,7 +730,7 @@ e_mail_shell_view_private_dispose (EMailShellView *mail_shell_view) } if (priv->search_account_cancel != NULL) { - camel_operation_unref (priv->search_account_cancel); + g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } } diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 18db5e2373..3e58330d93 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -504,7 +504,7 @@ all_accounts: if (priv->search_account_cancel != NULL) { camel_operation_cancel (priv->search_account_cancel); - camel_operation_unref (priv->search_account_cancel); + g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } @@ -537,7 +537,7 @@ all_accounts: if (search_folder != NULL) { if (priv->search_account_cancel != NULL) { camel_operation_cancel (priv->search_account_cancel); - camel_operation_unref (priv->search_account_cancel); + g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } @@ -589,7 +589,7 @@ all_accounts: camel_vee_folder_set_expression (search_folder, query); - priv->search_account_cancel = camel_operation_new (NULL, NULL); + priv->search_account_cancel = camel_operation_new (); /* This takes ownership of the folder list. */ mail_shell_view_setup_search_results_folder ( @@ -621,7 +621,7 @@ current_account: if (priv->search_account_cancel != NULL) { camel_operation_cancel (priv->search_account_cancel); - camel_operation_unref (priv->search_account_cancel); + g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } @@ -654,7 +654,7 @@ current_account: if (search_folder != NULL) { if (priv->search_account_cancel != NULL) { camel_operation_cancel (priv->search_account_cancel); - camel_operation_unref (priv->search_account_cancel); + g_object_unref (priv->search_account_cancel); priv->search_account_cancel = NULL; } @@ -688,7 +688,7 @@ current_account: camel_vee_folder_set_expression (search_folder, query); - priv->search_account_cancel = camel_operation_new (NULL, NULL); + priv->search_account_cancel = camel_operation_new (); /* This takes ownership of the folder list. */ mail_shell_view_setup_search_results_folder ( -- cgit