X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=7327119a4ede28aa30481131f67bc63c4a83ca83;hp=87dbf0d3e6ec343158eba0f47634da2152ad065f;hb=98bc76b00da273d0253f82b32ba4384e6b9dd957;hpb=d46e9d0e18026c1175d24e2e9b80f21edfb23c13;ds=sidebyside

diff --git a/src/modest-main.c b/src/modest-main.c
index 87dbf0d..7327119 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -40,6 +40,8 @@
 #include <tny-simple-list.h>
 
 #include <modest-runtime.h>
+#include <modest-init.h>
+
 #include <modest-defs.h>
 #include <modest-tny-account-store.h>
 #include <modest-tny-platform-factory.h>
@@ -116,8 +118,8 @@ main (int argc, char *argv[])
 	}
 	g_option_context_free (context);
 	
-	if (!modest_runtime_init ()) {
-		g_printerr ("modest: cannot init runtime\n");
+	if (!modest_init_init_core ()) {
+		g_printerr ("modest: cannot init modest core\n");
 		return MODEST_ERR_INIT;
 		
 	}
@@ -126,8 +128,8 @@ main (int argc, char *argv[])
 	g_free (account);
 	
 	if (!batch) {
-		if (!modest_runtime_init_ui (argc, argv)) {
-			g_printerr ("modest: cannot start ui\n");
+		if (!modest_init_init_ui (argc, argv)) {
+			g_printerr ("modest: cannot init modest ui\n");
 			retval = MODEST_ERR_UI;
 			goto cleanup;
 		} else {
@@ -155,9 +157,9 @@ cleanup:
 	g_free (cc);
 	g_free (body);
 	g_free (account);
-
-	if (!modest_runtime_uninit ()) 
-		g_printerr ("modest: modest_runtime_uninit failed\n");
+	
+	if (!modest_init_uninit ()) 
+		g_printerr ("modest: modest_init_uninit failed\n");
 
 	return retval;
 }