[evolution-mapi] Adapt to Camel API changes.

[Matthew Barnes <mbarnes src gnome org>]

commit c4c570474fb993bc7dcbb95f9a867072911ffa0f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed May 5 22:29:42 2010 -0400

    Adapt to Camel API changes.

 src/camel/camel-mapi-folder.c        |   10 +++++-----
 src/camel/camel-mapi-notifications.c |    2 +-
 src/camel/camel-mapi-store.c         |   22 +++++++++++-----------
 src/camel/camel-mapi-summary.c       |    2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index 3e75ccb..f05fc4e 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -767,7 +767,7 @@ mapi_sync_deleted (CamelSession *session, CamelSessionThreadMsg *msg)
 		/* Check if we have to stop */
 		if (camel_operation_cancel_check(NULL)) {
 			if (camel_folder_change_info_changed (changes))
-				camel_object_trigger_event (m->folder, "folder_changed", changes);
+				camel_folder_changed (m->folder, changes);
 			camel_folder_change_info_free (changes);
 			return;
 		}
@@ -776,7 +776,7 @@ mapi_sync_deleted (CamelSession *session, CamelSessionThreadMsg *msg)
 	camel_operation_end (NULL);
 
 	if (camel_folder_change_info_changed (changes))
-		camel_object_trigger_event (m->folder, "folder_changed", changes);
+		camel_folder_changed (m->folder, changes);
 	camel_folder_change_info_free (changes);
 
 	m->need_refresh = camel_folder_summary_count (m->folder->summary) != g_slist_length (server_uid_list);
@@ -1173,7 +1173,7 @@ mapi_refresh_folder(CamelFolder *folder, CamelException *ex)
 
 		camel_session_thread_queue (session, &deleted_items_op_msg->msg, 0);
 
-		camel_object_trigger_event (folder, "folder_changed", fetch_data->changes);
+		camel_folder_changed (folder, fetch_data->changes);
 		camel_folder_change_info_free (fetch_data->changes);
 	}
 
@@ -2043,7 +2043,7 @@ mapi_expunge (CamelFolder *folder, CamelException *ex)
 	}
 
 	if (delete)
-		camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes);
+		camel_folder_changed (folder, changes);
 
 	g_free (folder_id);
 	camel_folder_change_info_free (changes);
@@ -2107,7 +2107,7 @@ mapi_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
 				camel_folder_summary_remove_uid (source->summary, uids->pdata[i]);
 				camel_folder_change_info_remove_uid (changes, uids->pdata[i]);
 			}
-			camel_object_trigger_event (source, "folder_changed", changes);
+			camel_folder_changed (source, changes);
 			camel_folder_change_info_free (changes);
 
 		}
diff --git a/src/camel/camel-mapi-notifications.c b/src/camel/camel-mapi-notifications.c
index 8d48cb9..ee74957 100644
--- a/src/camel/camel-mapi-notifications.c
+++ b/src/camel/camel-mapi-notifications.c
@@ -126,7 +126,7 @@ process_mapi_new_mail_notif (CamelMapiStore *store, struct NewMailNotification *
 	camel_store_summary_touch ((CamelStoreSummary *)((CamelMapiStore *)parent_store)->summary);
 	camel_store_summary_save ((CamelStoreSummary *)((CamelMapiStore *)parent_store)->summary);
 
-	camel_object_trigger_event (folder, "folder_changed", fetch_data->changes);
+	camel_folder_changed (folder, fetch_data->changes);
 
 	camel_folder_change_info_free (fetch_data->changes);
 	g_free (res);
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index 135bdf5..d82b856 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -95,7 +95,7 @@ static gboolean		mapi_delete_folder(CamelStore *, const gchar *, CamelException
 static gboolean		mapi_rename_folder(CamelStore *, const gchar *, const gchar *, CamelException *);
 static CamelFolderInfo	*mapi_get_folder_info(CamelStore *, const gchar *, guint32, CamelException *);
 static gboolean		mapi_subscribe_folder(CamelStore *, const gchar *, CamelException *);
-static gboolean mapi_folder_subscribed (CamelStore *store, const gchar *folder_name);
+static gboolean mapi_folder_is_subscribed (CamelStore *store, const gchar *folder_name);
 static gboolean		mapi_unsubscribe_folder(CamelStore *, const gchar *, CamelException *);
 static gboolean		mapi_noop(CamelStore *, CamelException *);
 static CamelFolderInfo * mapi_build_folder_info(CamelMapiStore *mapi_store, const gchar *parent_name, const gchar *folder_name);
@@ -231,7 +231,7 @@ camel_mapi_store_class_init (CamelMapiStoreClass *class)
 	store_class->get_folder_info = mapi_get_folder_info;
 	store_class->free_folder_info = camel_store_free_folder_info_full;
 	store_class->subscribe_folder = mapi_subscribe_folder;
-	store_class->folder_subscribed = mapi_folder_subscribed;
+	store_class->folder_is_subscribed = mapi_folder_is_subscribed;
 	store_class->unsubscribe_folder = mapi_unsubscribe_folder;
 	store_class->noop = mapi_noop;
 	store_class->get_trash = mapi_get_trash;
@@ -583,7 +583,7 @@ mapi_create_folder(CamelStore *store, const gchar *parent_name, const gchar *fol
 
 		mapi_update_folder_hash_tables (mapi_store, root->full_name, fid, parent_id);
 
-		camel_object_trigger_event (CAMEL_OBJECT (store), "folder_created", root);
+		camel_store_folder_created (store, root);
 	}
 
 	camel_service_unlock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
@@ -624,7 +624,7 @@ mapi_forget_folder (CamelMapiStore *mapi_store, const gchar *folder_name, CamelE
 	camel_store_summary_save ((CamelStoreSummary *)mapi_store->summary);
 
 	fi = mapi_build_folder_info (mapi_store, NULL, folder_name);
-	camel_object_trigger_event (CAMEL_OBJECT (mapi_store), "folder_deleted", fi);
+	camel_store_folder_deleted (CAMEL_STORE (mapi_store), fi);
 	camel_folder_info_free (fi);
 }
 
@@ -1353,8 +1353,8 @@ remove_path_from_store_summary (const gchar *path, gpointer value, CamelMapiStor
 				fi->name = g_strdup (fi->name + 1);
 		}
 
-		camel_object_trigger_event (CAMEL_OBJECT (mstore), "folder_unsubscribed", fi);
-		camel_object_trigger_event (CAMEL_OBJECT (mstore), "folder_deleted", fi);
+		camel_store_folder_unsubscribed (CAMEL_STORE (mstore), fi);
+		camel_store_folder_deleted (CAMEL_STORE (mstore), fi);
 		camel_folder_info_free (fi);
 
 		camel_store_summary_info_free ((CamelStoreSummary *)mstore->summary, si);
@@ -1500,8 +1500,8 @@ mapi_folders_sync (CamelMapiStore *store, const gchar *top, guint32 flags, Camel
 			camel_store_summary_info_ref ((CamelStoreSummary *)store->summary, (CamelStoreInfo *)mapi_si);
 
 			if (!subscription_list) {
-				camel_object_trigger_event (CAMEL_OBJECT (store), "folder_created", info);
-				camel_object_trigger_event (CAMEL_OBJECT (store), "folder_subscribed", info);
+				camel_store_folder_created (CAMEL_STORE (store), info);
+				camel_store_folder_subscribed (CAMEL_STORE (store), info);
 			}
 		}
 
@@ -1671,14 +1671,14 @@ mapi_subscribe_folder(CamelStore *store, const gchar *folder_name, CamelExceptio
 	fi->flags |= CAMEL_FOLDER_NOCHILDREN;
 	fi->flags |= CAMEL_STORE_INFO_FOLDER_SUBSCRIBED;
 
-	camel_object_trigger_event (CAMEL_OBJECT (store), "folder_subscribed", fi);
+	camel_store_folder_subscribed (store, fi);
 	camel_folder_info_free (fi);
 
 	return TRUE;
 }
 
 static gboolean
-mapi_folder_subscribed (CamelStore *store, const gchar *folder_name)
+mapi_folder_is_subscribed (CamelStore *store, const gchar *folder_name)
 {
 	CamelMapiStore *mapi_store = (CamelMapiStore *) store;
 	CamelStoreInfo *si;
@@ -1724,7 +1724,7 @@ mapi_unsubscribe_folder(CamelStore *store, const gchar *folder_name, CamelExcept
 
 	fi = mapi_build_folder_info (mapi_store, parent_name, folder_name);
 
-	camel_object_trigger_event (CAMEL_OBJECT (store), "folder_unsubscribed", fi);
+	camel_store_folder_unsubscribed (store, fi);
 	camel_folder_info_free (fi);
 
 	return TRUE;
diff --git a/src/camel/camel-mapi-summary.c b/src/camel/camel-mapi-summary.c
index b285af9..feb4985 100644
--- a/src/camel/camel-mapi-summary.c
+++ b/src/camel/camel-mapi-summary.c
@@ -282,6 +282,6 @@ mapi_summary_clear (CamelFolderSummary *summary, gboolean uncache)
 	camel_folder_summary_clear_db (summary);
 
 	if (camel_folder_change_info_changed (changes))
-		camel_object_trigger_event (summary->folder, "folder_changed", changes);
+		camel_folder_changed (summary->folder, changes);
 	camel_folder_change_info_free (changes);
 }