* Fixed some compilation warnings

* Modified the Makefile with the new file additions and removals

pmo-trunk-r640

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 48d9d23..5b62ec7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,7 +41,6 @@ objects=\
         ${top_srcdir}/src/$(MODEST_PLATFORM)/libmodest-ui.la \
         ${top_srcdir}/src/widgets/libmodest-widgets.la \
         ${top_srcdir}/src/modest-account-mgr.o \
         ${top_srcdir}/src/$(MODEST_PLATFORM)/libmodest-ui.la \
         ${top_srcdir}/src/widgets/libmodest-widgets.la \
         ${top_srcdir}/src/modest-account-mgr.o \

-        ${top_srcdir}/src/modest-tny-platform-factory.o \

         ${top_srcdir}/src/modest-conf.o \
         ${top_srcdir}/src/modest-protocol-info.o \
         ${top_srcdir}/src/modest-formatter.o \
         ${top_srcdir}/src/modest-conf.o \
         ${top_srcdir}/src/modest-protocol-info.o \
         ${top_srcdir}/src/modest-formatter.o \

@@ -49,9 +48,11 @@ objects=\
         ${top_srcdir}/src/modest-pair.o \
         ${top_srcdir}/src/modest-marshal.o \
         ${top_srcdir}/src/modest-tny-account-store.o \
         ${top_srcdir}/src/modest-pair.o \
         ${top_srcdir}/src/modest-marshal.o \
         ${top_srcdir}/src/modest-tny-account-store.o \

+        ${top_srcdir}/src/modest-tny-platform-factory.o \

         ${top_srcdir}/src/modest-mail-operation-queue.o \
         ${top_srcdir}/src/modest-mail-operation.o \
         ${top_srcdir}/src/modest-tny-msg-actions.o \
         ${top_srcdir}/src/modest-mail-operation-queue.o \
         ${top_srcdir}/src/modest-mail-operation.o \
         ${top_srcdir}/src/modest-tny-msg-actions.o \

+        ${top_srcdir}/src/modest-tny-folder.o \

         ${top_srcdir}/src/modest-text-utils.o
 
 
         ${top_srcdir}/src/modest-text-utils.o
 
 

diff --git a/tests/check_folder-transfer.c b/tests/check_folder-transfer.c
index 58531dc..18fd3da 100644 (file)
--- a/tests/check_folder-transfer.c
+++ b/tests/check_folder-transfer.c
@@ -126,7 +126,7 @@ main (int argc, char **argv)
        g_option_context_free (context);
 
        fact = TNY_PLATFORM_FACTORY (modest_tny_platform_factory_get_instance ());
        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));
+       acc_mgr = MODEST_ACCOUNT_MGR (modest_tny_platform_factory_get_account_mgr_instance (MODEST_TNY_PLATFORM_FACTORY (fact)));

        account_store = tny_platform_factory_new_account_store (fact);  
 
        if (cachedir)
        account_store = tny_platform_factory_new_account_store (fact);  
 
        if (cachedir)

diff --git a/tests/check_update-account.c b/tests/check_update-account.c
index b9213d9..48ccd39 100644 (file)
--- a/tests/check_update-account.c
+++ b/tests/check_update-account.c
@@ -76,7 +76,7 @@ func (gpointer_data)
        TnyList *accounts;
 
        fact = TNY_PLATFORM_FACTORY (modest_tny_platform_factory_get_instance ());
        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));
+       acc_mgr = MODEST_ACCOUNT_MGR (modest_tny_platform_factory_get_account_mgr_instance (MODEST_TNY_PLATFORM_FACTORY (fact)));

        account_store = tny_platform_factory_new_account_store (fact);  
 
        /* Get accounts */
        account_store = tny_platform_factory_new_account_store (fact);  
 
        /* Get accounts */

@@ -91,7 +91,7 @@ func (gpointer_data)
        g_object_unref (G_OBJECT (iter));
        g_object_unref (G_OBJECT (accounts));
 
        g_object_unref (G_OBJECT (iter));
        g_object_unref (G_OBJECT (accounts));
 

-       queue = modest_tny_platform_factory_get_modest_mail_operation_queue_instance (fact);
+       queue = modest_tny_platform_factory_get_mail_operation_queue_instance (MODEST_TNY_PLATFORM_FACTORY (fact));

        mail_op = modest_mail_operation_new ();
        
        g_signal_connect (G_OBJECT (mail_op), "progress_changed", 
        mail_op = modest_mail_operation_new ();
        
        g_signal_connect (G_OBJECT (mail_op), "progress_changed",