[evolution-ews] Camel start using delete folder operation new API

[Pavel Ocheretny <pocheretny src gnome org>]

commit 21cc5ca0bcd94c4649da52f11a578b0ae4f8c3fd
Author: Pavel Ocheretny <pocheretny git gnome org>
Date:   Wed May 4 22:07:23 2011 +0300

    Camel start using delete folder operation new API

 src/camel/camel-ews-store.c |   12 ++++--------
 src/camel/camel-ews-store.h |    2 ++
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index e2365bd..62effbf 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -551,7 +551,7 @@ ews_create_folder_sync (CamelStore *store,
 	CamelEwsStoreSummary *ews_summary = ews_store->summary;
 	gchar *fid = NULL;
 	gchar *full_name;
-	EwsFolderId *folder_id;
+	EwsFolderId *folder_id = NULL;
 	CamelFolderInfo *fi = NULL;
 
 	
@@ -604,7 +604,6 @@ ews_delete_folder_sync	(CamelStore *store,
 	CamelEwsStore *ews_store = CAMEL_EWS_STORE (store);
 	CamelEwsStoreSummary *ews_summary = ews_store->summary;
 	gchar *fid;
-	EVO2(GCancellable *cancellable = NULL;)
 	CamelFolderInfo *fi = NULL;
 
 	fid = camel_ews_store_summary_get_folder_id_from_name (ews_summary,
@@ -615,10 +614,9 @@ ews_delete_folder_sync	(CamelStore *store,
 		return FALSE;
 	}
 
-	if (!e_ews_connection_delete_folder (ews_store->priv->cnc,
-					     EWS_PRIORITY_MEDIUM,
+	if (!e_ews_delete_folder_operation_sync (ews_store->priv->cnc,
 					     fid, FALSE, "HardDelete",
-					     cancellable, error)) {
+					     error)) {
 		g_free (fid);
 		return FALSE;
 	}
@@ -669,7 +667,6 @@ ews_rename_folder_sync	(CamelStore *store,
 	CamelEwsStore *ews_store = CAMEL_EWS_STORE (store);
 	CamelEwsStoreSummary *ews_summary = ews_store->summary;
 	const gchar *old_slash, *new_slash;
-	EVO2(GCancellable *cancellable = NULL;)
 	gchar *fid;
 	gchar *changekey;
 	gboolean res = FALSE;
@@ -765,8 +762,7 @@ ews_rename_folder_sync	(CamelStore *store,
 				goto out;
 			}
 		}
-		if (!e_ews_connection_move_folder (ews_store->priv->cnc, EWS_PRIORITY_MEDIUM,
-						   pfid, fid, cancellable, error)) {
+		if (!e_ews_move_folder_operation_sync (ews_store->priv->cnc, pfid, fid, error)) {
 			g_free (pfid);
 			goto out;
 		}
diff --git a/src/camel/camel-ews-store.h b/src/camel/camel-ews-store.h
index 6ab2b6b..c8eae68 100644
--- a/src/camel/camel-ews-store.h
+++ b/src/camel/camel-ews-store.h
@@ -28,6 +28,8 @@
 
 #include <e-ews-connection.h>
 #include <e-ews-create-folder-operation.h>
+#include <e-ews-delete-folder-operation.h>
+#include <e-ews-move-folder-operation.h>
 #include "camel-ews-store-summary.h"
 
 /* Standard GObject macros */