X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=tests%2Fcheck_update-account.c;h=3039e912e0e89499339df11d2e6b7eb4a2607486;hp=87b386225375d59675cb5d326007403f826ad81f;hb=7c966d893beecfa2f2d5ed4b8fe4ad5a0ae4247e;hpb=62c4b64a4ddad892e3baa830f065999ec39d0bc1

diff --git a/tests/check_update-account.c b/tests/check_update-account.c
index 87b3862..3039e91 100644
--- a/tests/check_update-account.c
+++ b/tests/check_update-account.c
@@ -39,7 +39,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"
 #include "modest-mail-operation-queue.h"
@@ -49,7 +49,6 @@ GMainLoop *main_loop;
 static void
 on_progress_changed (ModestMailOperation *mail_op, gpointer user_data)
 {
-	ModestMailOperationStatus status;
 	ModestMailOperationQueue *queue = NULL;
 
 	g_print ("Refreshed %d of %d\n", 
@@ -68,21 +67,18 @@ func (gpointer_data)
 {
 	TnyStoreAccount *account;
 	TnyIterator *iter;
-	TnyPlatformFactory *fact = NULL;
 	ModestAccountMgr *acc_mgr = NULL;
 	ModestMailOperation *mail_op = NULL;
 	ModestMailOperationQueue *queue = NULL;
-	TnyAccountStore *account_store = NULL;
+	ModestTnyAccountStore *account_store = NULL;
 	TnyList *accounts;
 
-	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();
 
 	/* Get accounts */
 	accounts = tny_simple_list_new ();
-
-	tny_account_store_get_accounts (account_store, accounts,
+	tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store), accounts,
 					TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
     
 	iter = tny_list_create_iterator (accounts);
@@ -91,7 +87,7 @@ func (gpointer_data)
 	g_object_unref (G_OBJECT (iter));
 	g_object_unref (G_OBJECT (accounts));
 
-	queue = modest_mail_operation_queue_get_instance ();
+	queue   = modest_runtime_get_mail_operation_queue ();
 	mail_op = modest_mail_operation_new ();
 	
 	g_signal_connect (G_OBJECT (mail_op), "progress_changed", 
@@ -101,18 +97,13 @@ func (gpointer_data)
 		modest_mail_operation_queue_add (queue, mail_op);
 
 	g_object_unref (G_OBJECT (mail_op));
+	
+	if (account)
+		g_object_unref (account);
 
 	return FALSE;
 }
 
-static void
-quit (gpointer data) 
-{
-	_exit (0);
-}
-
-
-
 int
 main (int argc, char **argv)
 {   
@@ -122,9 +113,7 @@ main (int argc, char **argv)
 	g_thread_init(NULL);
 
 	main_loop = g_main_loop_new (NULL, FALSE);
-        id = g_timeout_add(1000, func, main_loop);
-
-	g_timeout_add (5000, quit, main_loop); /* quit after 5 seconds */
+        id = g_timeout_add(10, func, main_loop);
 
 	g_main_loop_run(main_loop);