X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=d5c0930a3203ca7ac5051c8fcf9e01ad0d86f5bc;hp=a4f4a899c7ab7f35e5fb8930cadf5af6a4be739c;hb=HEAD;hpb=d9b1a33529f8cb9b45f7c45090d7b48c377f8df7 diff --git a/src/modest-init.c b/src/modest-init.c index a4f4a89..d5c0930 100644 --- a/src/modest-init.c +++ b/src/modest-init.c @@ -53,11 +53,10 @@ #include #include #include "modest-text-utils.h" - -#ifndef MODEST_TOOLKIT_GTK +#include +#ifdef MODEST_TOOLKIT_HILDON2 #include "modest-hildon-includes.h" #endif -#include static gboolean init_header_columns (ModestConf *conf, gboolean overwrite); static gboolean init_default_account_maybe (ModestAccountMgr *acc_mgr); @@ -185,17 +184,18 @@ modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, Modes static gboolean force_ke_recv_load (void) { +#ifdef MODEST_PLATFORM_MAEMO if (strcmp ("cerm_device_memory_full", _KR("cerm_device_memory_full")) == 0) { g_debug ("%s: cannot get translation for cerm_device_memory_full", __FUNCTION__); return FALSE; } +#endif return TRUE; } - gboolean modest_init (int argc, char *argv[]) { @@ -204,8 +204,8 @@ modest_init (int argc, char *argv[]) if (_is_initialized) { g_printerr ("modest: %s may only be invoked once\n", __FUNCTION__); return FALSE; - } - + } + init_i18n(); if (!force_ke_recv_load()) { @@ -221,25 +221,25 @@ modest_init (int argc, char *argv[]) /* initialize the prng, we need it when creating random files */ srandom((int)getpid()); - + if (!gnome_vfs_initialized()) { if (!gnome_vfs_init ()) { g_printerr ("modest: failed to init gnome-vfs\n"); return FALSE; } } - + if (!modest_runtime_init()) { modest_init_uninit (); g_printerr ("modest: failed to initialize the modest runtime\n"); return FALSE; } - + modest_plugin_factory_load_all (modest_runtime_get_plugin_factory ()); /* do an initial guess for the device name */ init_device_name (modest_runtime_get_conf()); - + if (!modest_platform_init(argc, argv)) { modest_init_uninit (); g_printerr ("modest: failed to run platform-specific initialization\n"); @@ -250,26 +250,26 @@ modest_init (int argc, char *argv[]) modest_address_book_init (); reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS; - if (!init_header_columns(modest_runtime_get_conf(), reset)) { + if (!init_header_columns(modest_runtime_get_conf(), TRUE)) { modest_init_uninit (); g_printerr ("modest: failed to init header columns\n"); return FALSE; } init_default_settings (modest_runtime_get_conf ()); - + if (!modest_init_local_folders(NULL)) { modest_init_uninit (); g_printerr ("modest: failed to init local folders\n"); return FALSE; } - + if (!init_default_account_maybe (modest_runtime_get_account_mgr ())) { modest_init_uninit (); g_printerr ("modest: failed to init default account\n"); return FALSE; - } - + } + if (!init_ui (argc, argv)) { modest_init_uninit (); g_printerr ("modest: failed to init ui\n"); @@ -591,22 +591,28 @@ init_debug_logging (void) } #endif - if (mflags & MODEST_RUNTIME_DEBUG_ABORT_ON_WARNING) g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); } - static void init_i18n (void) { - const gchar *lc_messages = getenv ("LC_MESSAGES"); + const gchar *lc_messages = setlocale (LC_MESSAGES, NULL); if (!lc_messages) { setenv ("LANGUAGE", "en_GB", 1); setenv ("LC_MESSAGES", "en_GB", 1); +#ifdef MODEST_PLATFORM_GNOME + } else { + gchar *new_lc_messages; + new_lc_messages = g_strconcat (lc_messages, ":en_GB", NULL); + setenv ("LANGUAGE", new_lc_messages, 1); + setenv ("LC_MESSAGES", new_lc_messages, 1); + g_free (new_lc_messages); +#endif } bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR); @@ -631,11 +637,10 @@ init_stock_icons (void) gint i; static GtkStockItem items[] = { -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL }, { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL }, #endif /*MODEST_TOOLKIT_GTK*/ - { MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL }, { MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL }, { MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL }, { MODEST_STOCK_REPLY, "reply", 0, 0, NULL }, @@ -645,11 +650,10 @@ init_stock_icons (void) }; static gchar *items_names [] = { -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 MODEST_TOOLBAR_ICON_SORT, MODEST_TOOLBAR_ICON_REFRESH, #endif /*MODEST_TOOLKIT_GTK*/ - MODEST_TOOLBAR_ICON_SPLIT_VIEW, MODEST_TOOLBAR_ICON_MAIL_SEND, MODEST_TOOLBAR_ICON_NEW_MAIL, MODEST_TOOLBAR_ICON_REPLY, @@ -727,10 +731,10 @@ init_default_settings (ModestConf *conf) modest_conf_set_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL); if (!modest_conf_key_exists (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL)) - modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, TRUE, NULL); + modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, FALSE, NULL); if (!modest_conf_key_exists (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL)) - modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL); + modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, FALSE, NULL); /* Editor keys */ if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL)) @@ -751,25 +755,26 @@ init_default_settings (ModestConf *conf) if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_UPDATE, NULL)) modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL); + if (!modest_conf_key_exists (conf, MODEST_CONF_NOTIFICATIONS, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_NOTIFICATIONS, TRUE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, TRUE, NULL); + if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL)) modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL); if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL)) - modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL); + modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_30_MIN, NULL); if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_SIZE_LIMIT, NULL)) - modest_conf_set_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, 1000, NULL); + modest_conf_set_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, 100, NULL); if (!modest_conf_key_exists (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, NULL)) modest_conf_set_bool (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, FALSE, NULL); -#ifdef MODEST_TOOLKIT_GTK - /* In Gnome port, we only allow editting plain text */ - modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, FALSE, NULL); -#else if (!modest_conf_key_exists (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, TRUE, NULL); -#endif if (!modest_conf_key_exists (conf, MODEST_CONF_REPLY_TYPE, NULL)) modest_conf_set_int (conf, MODEST_CONF_REPLY_TYPE, MODEST_TNY_MSG_REPLY_TYPE_QUOTE, NULL);