#include <modest-runtime-priv.h>
#include <modest-init.h>
#include <modest-defs.h>
+#include "modest-address-book.h"
#include <modest-singletons.h>
#include <widgets/modest-header-view.h>
#include <widgets/modest-folder-view.h>
#include <libgnomevfs/gnome-vfs.h>
#include <string.h>
#include "modest-text-utils.h"
-
-#ifndef MODEST_TOOLKIT_GTK
+#include <locale.h>
+#ifdef MODEST_TOOLKIT_HILDON2
#include "modest-hildon-includes.h"
#endif
-#include <locale.h>
static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
static gboolean init_default_account_maybe (ModestAccountMgr *acc_mgr);
static gboolean
force_ke_recv_load (void)
{
+#ifdef MODEST_PLATFORM_MAEMO
if (strcmp ("cerm_device_memory_full",
_KR("cerm_device_memory_full")) == 0) {
- g_warning ("%s: cannot get translation for cerm_device_memory_full",
+ g_debug ("%s: cannot get translation for cerm_device_memory_full",
__FUNCTION__);
return FALSE;
}
+#endif
return TRUE;
}
-
gboolean
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()) {
/* 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");
return FALSE;
}
+ /* Initialize addressbook */
+ 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");
{
/* Set application name */
g_set_application_name (modest_platform_get_app_name());
- /* g_message (modest_platform_get_app_name()); */
+ /* g_debug (modest_platform_get_app_name()); */
/* Init stock icons */
init_stock_icons ();
*/
gboolean
modest_init_local_folders (const gchar* location_filepath)
-{
+{
gboolean retval = TRUE;
gchar *maildir_path = modest_local_folder_info_get_maildir_path (location_filepath);
NULL);
const gboolean created = modest_init_one_local_folder (dir);
g_free(dir);
-
- if (!created) {
- retval = FALSE;
- }
- #if 0
- /* Do this if we only create the top-level dir: */
- if (g_mkdir_with_parents (maildir_path, 0755) < 0) {
- g_printerr ("modest: %s: failed to create %s\n", __FUNCTION__, location_filepath);
+ if (!created) {
retval = FALSE;
}
- #endif
}
else {
/* Create each of the standard on-disk folders.
for (i = 0; i != G_N_ELEMENTS(LOCAL_FOLDERS); ++i) {
gchar *dir = g_build_filename (maildir_path,
modest_local_folder_info_get_type_name(LOCAL_FOLDERS[i]),
- NULL);
+ NULL);
const gboolean created = modest_init_one_local_folder (dir);
g_free(dir);
-
+
if (!created) {
retval = FALSE;
}
}
}
-
+
g_free (maildir_path);
return retval;
}
g_type_init_with_debug_flags (gflags);
}
+#ifndef DEBUG
+static void
+null_log(const gchar* dom,
+ GLogLevelFlags l,
+ const gchar* m,
+ gpointer d)
+{
+ return;
+};
+#endif
+
static void
init_debug_logging (void)
{
ModestRuntimeDebugFlags mflags;
mflags = modest_runtime_get_debug_flags ();
-
+
+#ifndef DEBUG
+ if (! (mflags & MODEST_RUNTIME_DEBUG_CODE)) {
+ g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, null_log, NULL);
+ }
+#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)
{
- /* little trick make en_GB the fallback language, instead
- * of the logical IDs
- * we need the ugly ifdefs, because modest_platform_init is
- * too late.
- */
- 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 *language = g_strdup_printf ("%s:en_GB", lc_messages);
- setenv ("LANGUAGE", language, 1);
- g_free (language);
+ 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
}
- /* end of little trick */
bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
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 },
};
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,
g_object_unref (pixbuf);
}
else
- g_warning ("Modest: %s: failed to load %s icon", __FUNCTION__, items_names[i]);
+ g_warning ("%s: failed to load %s icon", __FUNCTION__, items_names[i]);
}
/* Drop our reference to the factory, GTK will hold a reference. */
g_object_unref (factory);
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))
if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);
+ /* File chooser keys */
+ if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL))
+ modest_conf_set_string (conf, MODEST_CONF_LATEST_ATTACH_FILE_PATH, "", NULL);
+ if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_INSERT_IMAGE_PATH, NULL))
+ modest_conf_set_string (conf, MODEST_CONF_LATEST_INSERT_IMAGE_PATH, "", NULL);
+ if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, NULL))
+ modest_conf_set_string (conf, MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, "", NULL);
+
/* Global settings */
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);
projects / modest / blobdiff