* fix small leak

[modest] / src / modest-runtime.c

diff --git a/src/modest-runtime.c b/src/modest-runtime.c
index 6badb49..ef15710 100644 (file)
--- a/src/modest-runtime.c
+++ b/src/modest-runtime.c
@@ -37,6 +37,7 @@
 #include <widgets/modest-header-view.h>
 #include <widgets/modest-folder-view.h>
 #include <modest-tny-platform-factory.h>
+#include <modest-platform.h>
 #include <modest-widget-memory.h>
 #include <modest-widget-memory-priv.h>
 #include <modest-local-folder-info.h>
@@ -44,11 +45,6 @@
 #include <modest-account-mgr-helpers.h>
 #include <modest-icon-names.h>
 
-#if MODEST_PLATFORM_ID==2 /* maemo/hildon */
-#include <libosso.h>
-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);
@@ -57,6 +53,7 @@ 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;
@@ -130,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;
@@ -146,6 +141,8 @@ modest_runtime_init (void)
                g_printerr ("modest: failed to init header columns\n");
                return FALSE;
        }
+
+       init_default_settings (modest_singletons_get_conf (my_singletons));
        
        if (!init_local_folders()) {
                modest_runtime_uninit ();
@@ -534,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
@@ -566,7 +548,7 @@ 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 },
@@ -579,7 +561,7 @@ 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_SEND_RECEIVE,  */
                        MODEST_TOOLBAR_ICON_REPLY,      
                        MODEST_TOOLBAR_ICON_REPLY_ALL,
                        MODEST_TOOLBAR_ICON_FORWARD,
@@ -659,3 +641,21 @@ init_test_accounts (ModestAccountMgr *acc_mgr)
        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);
+
+}