2007-06-12 Murray Cumming <murrayc@murrayc.com>

[modest] / tests / check_folder-transfer.c

diff --git a/tests/check_folder-transfer.c b/tests/check_folder-transfer.c
index 58531dc..7f1376d 100644 (file)
--- a/tests/check_folder-transfer.c
+++ b/tests/check_folder-transfer.c
@@ -38,7 +38,7 @@
 #include <tny-folder.h>
 #include <tny-folder-store.h>
 #include <modest-tny-platform-factory.h>
-
+#include <modest-runtime.h>
 
 #include <modest-account-mgr.h>
 #include <modest-mail-operation.h>
@@ -106,10 +106,9 @@ main (int argc, char **argv)
        TnyStoreAccount *account;
        TnyIterator *iter;
        TnyFolder *folder_src = NULL, *folder_dst = NULL;
-       TnyPlatformFactory *fact = NULL;
        ModestAccountMgr *acc_mgr = NULL;
        ModestMailOperation *mail_op = NULL;
-       TnyAccountStore *account_store = NULL;
+       ModestTnyAccountStore *account_store = NULL;
        guint src_num_headers = 0, dst_num_headers = 0;
        GError *err;
     
@@ -125,9 +124,8 @@ main (int argc, char **argv)
        }
        g_option_context_free (context);
 
-       fact = TNY_PLATFORM_FACTORY (modest_tny_platform_factory_get_instance ());
-       acc_mgr = MODEST_ACCOUNT_MGR (modest_tny_platform_factory_get_modest_account_mgr_instance (fact));
-       account_store = tny_platform_factory_new_account_store (fact);  
+       acc_mgr = modest_runtime_get_account_mgr ();
+       account_store = modest_runtime_get_account_store();
 
        if (cachedir)
                g_print ("Using %s as cache directory\n", cachedir);
@@ -140,8 +138,9 @@ main (int argc, char **argv)
        /* Get accounts */
        accounts = tny_simple_list_new ();
 
-       tny_account_store_get_accounts (account_store, accounts,
-             TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+       tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
+                                       accounts,
+                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
     
        iter = tny_list_create_iterator (accounts);
        account = (TnyStoreAccount*) tny_iterator_get_current (iter);
@@ -169,14 +168,9 @@ main (int argc, char **argv)
 
        mail_op = modest_mail_operation_new ();
                
-       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);
        
        g_object_unref (G_OBJECT (src_headers));
        g_object_unref (G_OBJECT (mail_op));