X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=tests%2Fcheck_folder-transfer.c;h=7278e04561bb7c831c173f568866e96f847d07e3;hp=470967683fa3e0ac349df67286c543903c7b8df5;hb=f1b54c4a866e1449165c22314474a0d0bdda1cf0;hpb=b8c44ea979806119e8925fc0c86e4e5cfafc3528

diff --git a/tests/check_folder-transfer.c b/tests/check_folder-transfer.c
index 4709676..7278e04 100644
--- a/tests/check_folder-transfer.c
+++ b/tests/check_folder-transfer.c
@@ -38,11 +38,11 @@
 #include <tny-folder.h>
 #include <tny-folder-store.h>
 #include <modest-tny-platform-factory.h>
-#include <modest-widget-factory.h>
 #include <modest-runtime.h>
 
 #include <modest-account-mgr.h>
 #include <modest-mail-operation.h>
+#include <modest-init.h>
 
 static gchar *cachedir=NULL;
 static gboolean move=FALSE;
@@ -60,25 +60,27 @@ find_folders (TnyFolderStore *store, TnyFolderStoreQuery *query,
 		return;
 
 	folders = tny_simple_list_new ();
-	tny_folder_store_get_folders (store, folders, query, NULL);
+	tny_folder_store_get_folders (store, folders, query, FALSE /*no poke*/, NULL);
 	iter = tny_list_create_iterator (folders);
 
 	while (!tny_iterator_is_done (iter) && (!*folder_src || !*folder_dst))
 	{
 		TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter);
-		const gchar *folder_name = NULL;
+		if (folder) {
+			const gchar *folder_name = NULL;
 
-		folder_name = tny_folder_get_name (TNY_FOLDER (folder));
+			folder_name = tny_folder_get_name (TNY_FOLDER (folder));
 
-		if (strcmp (folder_name, src_name) == 0)
-		    *folder_src = g_object_ref (folder);
+			if (strcmp (folder_name, src_name) == 0)
+			    *folder_src = g_object_ref (folder);
 		
-		if (!strcmp (folder_name, dst_name))
-		    *folder_dst = g_object_ref (folder);
+			if (!strcmp (folder_name, dst_name))
+			    *folder_dst = g_object_ref (folder);
 
-		find_folders (folder, query, folder_src, folder_dst);
+			find_folders (folder, query, folder_src, folder_dst);
 	    
- 		g_object_unref (G_OBJECT (folder));
+ 			g_object_unref (G_OBJECT (folder));
+		}
 
 		tny_iterator_next (iter);	    
 	}
@@ -125,6 +127,10 @@ main (int argc, char **argv)
 	}
 	g_option_context_free (context);
 
+	if (!modest_init (argc, argv)) {
+		return 0;
+	}
+
 	acc_mgr = modest_runtime_get_account_mgr ();
 	account_store = modest_runtime_get_account_store();
 
@@ -167,16 +173,12 @@ main (int argc, char **argv)
 	src_headers = tny_simple_list_new ();
 	tny_folder_get_headers (folder_src, src_headers, TRUE, NULL);
 
-	mail_op = modest_mail_operation_new ();
+	mail_op = modest_mail_operation_new (NULL);
 		
-	if (move)
-		modest_mail_operation_move_folder (mail_op, 
-						   folder_src, 
-						   TNY_FOLDER_STORE (folder_dst));
-	else
-		modest_mail_operation_copy_folder (mail_op, 
-						   folder_src, 
-						   TNY_FOLDER_STORE (folder_dst));
+	modest_mail_operation_xfer_folder (mail_op, 
+					   folder_src, 
+					   TNY_FOLDER_STORE (folder_dst), move,
+					   NULL, NULL);
 	
 	g_object_unref (G_OBJECT (src_headers));
 	g_object_unref (G_OBJECT (mail_op));