X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-runtime.c;h=ef15710a12c2dec5981a12ebe5d90891f3370250;hb=285d0bef95f1428414ada55d8c8012d083129c51;hp=f4036ce5ff75d653cb0ef9bc2605ab46dca0c653;hpb=74b77f6caf3fe1bc738e43fc6edf67b20f9b6d88;p=modest diff --git a/src/modest-runtime.c b/src/modest-runtime.c index f4036ce..ef15710 100644 --- a/src/modest-runtime.c +++ b/src/modest-runtime.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -44,11 +45,6 @@ #include #include -#if MODEST_PLATFORM_ID==2 /* maemo/hildon */ -#include -static gboolean init_hildon (void); -#endif /* MODEST_PLATFORM_ID==2 */ - static gboolean init_header_columns (ModestConf *conf, gboolean overwrite); static gboolean init_local_folders (void); static gboolean init_default_account_maybe (ModestAccountMgr *acc_mgr); @@ -56,6 +52,9 @@ static void init_i18n (void); static void init_stock_icons (void); static void init_debug_g_type (void); static void init_debug_logging (void); +static void init_test_accounts (ModestAccountMgr *acc_mgr); +static void init_default_settings (ModestConf *conf); + static ModestSingletons *_singletons = NULL; @@ -128,14 +127,12 @@ modest_runtime_init (void) g_printerr ("modest: failed to initialize singletons\n"); return FALSE; } - -#if MODEST_PLATFORM_ID==2 - if (!init_hildon ()) { + + if (!modest_platform_init()) { modest_runtime_uninit (); - g_printerr ("modest: failed to initialize hildon\n"); + g_printerr ("modest: failed to run platform-specific initialization\n"); return FALSE; } -#endif /* MODEST_PLATFORM_ID==2 */ /* based on the debug settings, we decide whether to overwrite old settings */ reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS; @@ -145,6 +142,8 @@ modest_runtime_init (void) return FALSE; } + init_default_settings (modest_singletons_get_conf (my_singletons)); + if (!init_local_folders()) { modest_runtime_uninit (); g_printerr ("modest: failed to init local folders\n"); @@ -157,6 +156,10 @@ modest_runtime_init (void) return FALSE; } + /* create the test accounts if the debug flag for that is set */ + if (modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_TINY_TEST_ACCOUNTS) + init_test_accounts (modest_singletons_get_account_mgr (my_singletons)); + /* don't initialize _singletons before all the other init stuff * is done; thus, using any of the singleton stuff before * runtime is fully init'ed is avoided @@ -281,11 +284,12 @@ ModestRuntimeDebugFlags modest_runtime_get_debug_flags () { static const GDebugKey debug_keys[] = { - { "abort-on-warning", MODEST_RUNTIME_DEBUG_ABORT_ON_WARNING }, - { "log-actions", MODEST_RUNTIME_DEBUG_LOG_ACTIONS }, - { "debug-objects", MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS }, - { "debug-signals", MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS }, - { "factory-settings", MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS } + { "abort-on-warning", MODEST_RUNTIME_DEBUG_ABORT_ON_WARNING }, + { "log-actions", MODEST_RUNTIME_DEBUG_LOG_ACTIONS }, + { "debug-objects", MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS }, + { "debug-signals", MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS }, + { "factory-settings", MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS}, + { "tiny-test-accounts", MODEST_RUNTIME_DEBUG_TINY_TEST_ACCOUNTS} }; const gchar *str; static ModestRuntimeDebugFlags debug_flags = -1; @@ -527,21 +531,6 @@ init_i18n (void) } -#if MODEST_PLATFORM_ID==2 -static gboolean -init_hildon (void) -{ - osso_context_t *osso_context = - osso_initialize(PACKAGE, PACKAGE_VERSION, - TRUE, NULL); - if (!osso_context) { - g_printerr ("modest: failed to acquire osso context\n"); - return FALSE; - } -} -#endif /* MODEST_PLATFORM_ID==2 */ - - /* * This function registers our custom toolbar icons, so they can be * themed. The idea of this function was taken from the gtk-demo @@ -559,11 +548,11 @@ init_stock_icons (void) static GtkStockItem items[] = { { MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL }, { MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL }, -/* { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL }, */ +/* { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL }, */ { MODEST_STOCK_REPLY, "reply", 0, 0, NULL }, { MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL }, { MODEST_STOCK_FORWARD, "forward", 0, 0, NULL }, -/* { MODEST_STOCK_DELETE, "delete", 0, 0, NULL }, */ + { MODEST_STOCK_DELETE, "delete", 0, 0, NULL }, /* { MODEST_STOCK_NEXT, "next", 0, 0, NULL }, */ /* { MODEST_STOCK_PREV, "prev", 0, 0, NULL }, */ /* { MODEST_STOCK_STOP, "stop", 0, 0, NULL } */ @@ -571,12 +560,12 @@ init_stock_icons (void) static gchar *items_names [] = { MODEST_TOOLBAR_ICON_MAIL_SEND, -/* MODEST_TOOLBAR_ICON_NEW_MAIL, */ - MODEST_TOOLBAR_ICON_SEND_RECEIVE, + MODEST_TOOLBAR_ICON_NEW_MAIL, +/* MODEST_TOOLBAR_ICON_SEND_RECEIVE, */ MODEST_TOOLBAR_ICON_REPLY, MODEST_TOOLBAR_ICON_REPLY_ALL, MODEST_TOOLBAR_ICON_FORWARD, -/* MODEST_TOOLBAR_ICON_DELETE, */ + MODEST_TOOLBAR_ICON_DELETE, /* MODEST_TOOLBAR_ICON_NEXT, */ /* MODEST_TOOLBAR_ICON_PREV, */ /* MODEST_TOOLBAR_ICON_STOP */ @@ -615,3 +604,58 @@ init_stock_icons (void) g_object_unref (factory); } } + + +static void +init_test_accounts (ModestAccountMgr *acc_mgr) +{ + const gchar *imap_test = "TnyImapTest"; + const gchar *pop_test = "TnyPopTest"; + const gchar *smtp_test = "TnySmtpTest"; + + if (!modest_account_mgr_account_exists (acc_mgr, imap_test, FALSE)) + modest_account_mgr_add_server_account (acc_mgr, + imap_test, + "imap2.tinymail.org", + "tnytest", "tnytest", + MODEST_PROTOCOL_STORE_IMAP, + MODEST_PROTOCOL_SECURITY_NONE, + MODEST_PROTOCOL_AUTH_NONE); + if (!modest_account_mgr_account_exists (acc_mgr, pop_test, FALSE)) + modest_account_mgr_add_server_account (acc_mgr, + pop_test, + "imap2.tinymail.org", + "tnytest", "tnytest", + MODEST_PROTOCOL_STORE_POP, + MODEST_PROTOCOL_SECURITY_NONE, + MODEST_PROTOCOL_AUTH_NONE); + if (!modest_account_mgr_account_exists (acc_mgr, smtp_test, FALSE)) + modest_account_mgr_add_server_account (acc_mgr, + smtp_test, + "127.0.0.1", + NULL,NULL, + MODEST_PROTOCOL_TRANSPORT_SMTP, + MODEST_PROTOCOL_SECURITY_NONE, + MODEST_PROTOCOL_AUTH_NONE); + + modest_account_mgr_add_account (acc_mgr, imap_test, imap_test, smtp_test); + modest_account_mgr_add_account (acc_mgr, pop_test, pop_test, smtp_test); +} + + +static void +init_default_settings (ModestConf *conf) +{ + if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, TRUE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_CONNECT_AT_STARTUP, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_CONNECT_AT_STARTUP, TRUE, NULL); + +}