From 5c53935ab2b5695283819297f11d4586425e9c0a Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 6 Jul 2012 22:14:20 -0400
Subject: Adapt to CamelStore API change.
compare_folder_name() -> equal_folder_name()
---
libemail-engine/e-mail-folder-utils.c | 4 ++--
mail/e-mail-backend.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/libemail-engine/e-mail-folder-utils.c b/libemail-engine/e-mail-folder-utils.c
index 6d2f3f499f..aa1541c15c 100644
--- a/libemail-engine/e-mail-folder-utils.c
+++ b/libemail-engine/e-mail-folder-utils.c
@@ -1653,9 +1653,9 @@ e_mail_folder_uri_equal (CamelSession *session,
/* Doesn't matter which store we use since they're the same. */
class = CAMEL_STORE_GET_CLASS (store_a);
- g_return_val_if_fail (class->compare_folder_name != NULL, FALSE);
+ g_return_val_if_fail (class->equal_folder_name != NULL, FALSE);
- equal = class->compare_folder_name (folder_name_a, folder_name_b);
+ equal = class->equal_folder_name (folder_name_a, folder_name_b);
exit:
if (success_a) {
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index b0e4326088..075f0b09ac 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -424,7 +424,7 @@ mail_backend_folder_deleted_cb (MailFolderCache *folder_cache,
registry = e_shell_get_registry (shell);
class = CAMEL_STORE_GET_CLASS (store);
- g_return_if_fail (class->compare_folder_name != NULL);
+ g_return_if_fail (class->equal_folder_name != NULL);
session = e_mail_backend_get_session (backend);
alert_sink = e_mail_backend_get_alert_sink (backend);
@@ -453,7 +453,7 @@ mail_backend_folder_deleted_cb (MailFolderCache *folder_cache,
e_source_mail_composition_get_drafts_folder (
E_SOURCE_MAIL_COMPOSITION (extension));
- if (class->compare_folder_name (drafts_folder_uri, uri)) {
+ if (class->equal_folder_name (drafts_folder_uri, uri)) {
GError *error = NULL;
e_source_mail_composition_set_drafts_folder (
@@ -484,7 +484,7 @@ mail_backend_folder_deleted_cb (MailFolderCache *folder_cache,
e_source_mail_submission_get_sent_folder (
E_SOURCE_MAIL_SUBMISSION (extension));
- if (class->compare_folder_name (sent_folder_uri, uri)) {
+ if (class->equal_folder_name (sent_folder_uri, uri)) {
GError *error = NULL;
e_source_mail_submission_set_sent_folder (
@@ -539,7 +539,7 @@ mail_backend_folder_renamed_cb (MailFolderCache *folder_cache,
registry = e_shell_get_registry (shell);
class = CAMEL_STORE_GET_CLASS (store);
- g_return_if_fail (class->compare_folder_name != NULL);
+ g_return_if_fail (class->equal_folder_name != NULL);
old_uri = e_mail_folder_uri_build (store, old_folder_name);
new_uri = e_mail_folder_uri_build (store, new_folder_name);
@@ -558,7 +558,7 @@ mail_backend_folder_renamed_cb (MailFolderCache *folder_cache,
e_source_mail_composition_get_drafts_folder (
E_SOURCE_MAIL_COMPOSITION (extension));
- if (class->compare_folder_name (drafts_folder_uri, old_uri)) {
+ if (class->equal_folder_name (drafts_folder_uri, old_uri)) {
GError *error = NULL;
e_source_mail_composition_set_drafts_folder (
@@ -589,7 +589,7 @@ mail_backend_folder_renamed_cb (MailFolderCache *folder_cache,
e_source_mail_submission_get_sent_folder (
E_SOURCE_MAIL_SUBMISSION (extension));
- if (class->compare_folder_name (sent_folder_uri, old_uri)) {
+ if (class->equal_folder_name (sent_folder_uri, old_uri)) {
GError *error = NULL;
e_source_mail_submission_set_sent_folder (
--
cgit