* all:

[modest] / src / modest-tny-platform-factory.c

diff --git a/src/modest-tny-platform-factory.c b/src/modest-tny-platform-factory.c
index 1e3ae1e..d6a6a08 100644 (file)
--- a/src/modest-tny-platform-factory.c
+++ b/src/modest-tny-platform-factory.c
@@ -192,11 +192,11 @@ tny_platform_factory_init (gpointer g, gpointer iface_data)
        TnyPlatformFactoryIface *klass = (TnyPlatformFactoryIface *)g;
 
        klass->new_account_store_func = modest_tny_platform_factory_new_account_store;
-       klass->new_device_func = modest_tny_platform_factory_new_device;
-       klass->new_msg_view_func = modest_tny_platform_factory_new_msg_view;
-       klass->new_msg_func = modest_tny_platform_factory_new_msg;
-       klass->new_mime_part_func = modest_tny_platform_factory_new_mime_part;
-       klass->new_header_func = modest_tny_platform_factory_new_header;
+       klass->new_device_func        = modest_tny_platform_factory_new_device;
+       klass->new_msg_view_func      = modest_tny_platform_factory_new_msg_view;
+       klass->new_msg_func           = modest_tny_platform_factory_new_msg;
+       klass->new_mime_part_func     = modest_tny_platform_factory_new_mime_part;
+       klass->new_header_func        = modest_tny_platform_factory_new_header;
 
        return;
 }
@@ -218,7 +218,7 @@ modest_tny_platform_factory_new_account_store (TnyPlatformFactory *self)
 
        if (!priv->account_store) {
                if (!priv->account_mgr)
-                       modest_tny_platform_factory_get_modest_account_mgr_instance (self);
+                       modest_tny_platform_factory_get_account_mgr_instance (MODEST_TNY_PLATFORM_FACTORY (self));
 
                priv->account_store = modest_tny_account_store_new (priv->account_mgr);
        }
@@ -235,7 +235,7 @@ modest_tny_platform_factory_new_device (TnyPlatformFactory *self)
 #elif MODEST_PLATFORM_ID==2
        return TNY_DEVICE (tny_maemo_device_new ());
 #else
-       return NULL;
+       g_return_val_if_reached (NULL);
 #endif /* MODEST_PLATFORM */
 }
 
@@ -268,7 +268,7 @@ modest_tny_platform_factory_new_header (TnyPlatformFactory *self)
 
 
 ModestAccountMgr *
-modest_tny_platform_factory_get_modest_account_mgr_instance (TnyPlatformFactory *fact)
+modest_tny_platform_factory_get_account_mgr_instance (ModestTnyPlatformFactory *fact)
 {
        ModestTnyPlatformFactoryPrivate *priv;
 
@@ -276,8 +276,7 @@ modest_tny_platform_factory_get_modest_account_mgr_instance (TnyPlatformFactory
 
        if (!priv->account_mgr) {
                if (!priv->conf)
-                       modest_tny_platform_factory_get_modest_conf_instance (fact);
-
+                       modest_tny_platform_factory_get_conf_instance (fact);
                priv->account_mgr = modest_account_mgr_new (priv->conf);
        }
 
@@ -285,7 +284,7 @@ modest_tny_platform_factory_get_modest_account_mgr_instance (TnyPlatformFactory
 }
 
 ModestConf *
-modest_tny_platform_factory_get_modest_conf_instance (TnyPlatformFactory *fact)
+modest_tny_platform_factory_get_conf_instance (ModestTnyPlatformFactory *fact)
 {
        ModestTnyPlatformFactoryPrivate *priv;
 
@@ -298,7 +297,7 @@ modest_tny_platform_factory_get_modest_conf_instance (TnyPlatformFactory *fact)
 }
 
 ModestMailOperationQueue*   
-modest_tny_platform_factory_get_modest_mail_operation_queue_instance (TnyPlatformFactory *fact)
+modest_tny_platform_factory_get_mail_operation_queue_instance (ModestTnyPlatformFactory *fact)
 {
        ModestTnyPlatformFactoryPrivate *priv;