X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=e81aa98fed9e033dc95be030f711a2523bf10293;hp=2580951b60eb3a38096c9c29ad75f567bb2e9ade;hb=c6e92e9c0075505a97acc092ee6ac7d694b4b6f2;hpb=ef8694f7d80505ee356897d45d9757d7b68a6f5c diff --git a/src/modest-init.c b/src/modest-init.c index 2580951..e81aa98 100644 --- a/src/modest-init.c +++ b/src/modest-init.c @@ -48,6 +48,7 @@ #include #include "widgets/modest-global-settings-dialog.h" #include "modest-tny-msg.h" +#include #ifdef MODEST_PLATFORM_MAEMO #include "modest-hildon-includes.h" #endif @@ -61,6 +62,10 @@ static void init_debug_g_type (void); static void init_debug_logging (void); static void init_default_settings (ModestConf *conf); static void init_device_name (ModestConf *conf); +static gboolean init_ui (gint argc, gchar** argv); + + +static gboolean _is_initialized = FALSE; /* * defaults for the column headers @@ -72,7 +77,7 @@ typedef struct { } FolderCols; -static const guint MODEST_MAIN_PANED_POS = 280; +static const guint MODEST_MAIN_PANED_POS_PERCENTAGE = 30; static const FolderCols INBOX_COLUMNS_DETAILS[] = { {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0}, @@ -121,7 +126,8 @@ static const TnyFolderType LOCAL_FOLDERS[] = { }; #endif /* MODEST_PLATFORM_MAEMO */ -static GList* new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num) +static GList* +new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num) { GList *result = NULL; @@ -171,34 +177,41 @@ modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, Modes return result; } + gboolean -modest_init_init_core (void) +modest_init (int argc, char *argv[]) { gboolean reset; - static gboolean invoked = FALSE; - if (invoked) { + if (_is_initialized) { g_printerr ("modest: modest_init_init_core may only be invoked once\n"); - g_assert (!invoked); /* abort */ return FALSE; - } else - invoked = TRUE; + } init_i18n(); init_debug_g_type(); init_debug_logging(); + + /* 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; } - - + /* do an initial guess for the device name */ init_device_name (modest_runtime_get_conf()); - - if (!modest_platform_init()) { + + if (!modest_platform_init(argc, argv)) { modest_init_uninit (); g_printerr ("modest: failed to run platform-specific initialization\n"); return FALSE; @@ -223,20 +236,21 @@ modest_init_init_core (void) modest_init_uninit (); g_printerr ("modest: failed to init default account\n"); return FALSE; - } + } - return TRUE; + if (!init_ui (argc, argv)) { + modest_init_uninit (); + g_printerr ("modest: failed to init ui\n"); + return FALSE; + } + + return _is_initialized = TRUE; } -gboolean -modest_init_init_ui (gint argc, gchar** argv) +static gboolean +init_ui (gint argc, gchar** argv) { - if (!gtk_init_check(&argc, &argv)) { - g_printerr ("modest: failed to initialize graphical ui\n"); - return FALSE; - } - /* Set application name */ g_set_application_name (modest_platform_get_app_name()); /* g_message (modest_platform_get_app_name()); */ @@ -244,11 +258,10 @@ modest_init_init_ui (gint argc, gchar** argv) /* Init stock icons */ init_stock_icons (); - /* Init notification system */ - #ifndef MODEST_HILDON_VERSION_0 + /* Init notification system */ +#ifdef MODEST_HAVE_HILDON_NOTIFY notify_init ("Basics"); - #endif - +#endif return TRUE; } @@ -256,9 +269,19 @@ modest_init_init_ui (gint argc, gchar** argv) gboolean modest_init_uninit (void) { + if (!_is_initialized) + return TRUE; + + if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */ + gnome_vfs_shutdown (); + if (!modest_runtime_uninit()) g_printerr ("modest: failed to uninit runtime\n"); - + + if (!modest_platform_uninit()) + g_printerr ("modest: failed to uninit platform\n"); + + _is_initialized = FALSE; return TRUE; } @@ -292,6 +315,7 @@ save_header_settings (ModestConf *conf, TnyFolderType type, * there was nothing before */ if (!overwrite && modest_conf_key_exists(conf, key, NULL)) { g_free (key); + g_free (sort_key); return TRUE; } @@ -307,7 +331,7 @@ save_header_settings (ModestConf *conf, TnyFolderType type, if ( col_num > 0 ) { gint sort_col_id; - if (cols[i].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT) + if (cols[0].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT) sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN; else sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN; @@ -374,11 +398,12 @@ init_header_columns (ModestConf *conf, gboolean overwrite) }; } - key = _modest_widget_memory_get_keyname (MODEST_CONF_MAIN_PANED_KEY, MODEST_WIDGET_MEMORY_PARAM_POS); + key = _modest_widget_memory_get_keyname (MODEST_CONF_MAIN_PANED_KEY, + MODEST_WIDGET_MEMORY_PARAM_POS); /* if we're not in overwrite mode, only write stuff it * there was nothing before */ if (overwrite || !modest_conf_key_exists(conf, key, NULL)) - modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS, NULL); + modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL); g_free (key); return TRUE; @@ -419,15 +444,32 @@ gboolean modest_init_one_local_folder (gchar *maildir_path) gboolean modest_init_local_folders (const gchar* location_filepath) { + gboolean retval = TRUE; + gchar *maildir_path = modest_local_folder_info_get_maildir_path (location_filepath); if (location_filepath) { - /* For instance, for memory card, just create the top-level .modest folder: */ + /* For instance, for memory card, just create the top-level .modest folder + * and one "archive" folder (so that messages can be put somewhere): + */ + + gchar *dir = g_build_filename (maildir_path, + modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_ARCHIVE), + 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); - g_free (maildir_path); - return FALSE; + retval = FALSE; } + #endif } else { /* Create each of the standard on-disk folders. @@ -441,14 +483,13 @@ modest_init_local_folders (const gchar* location_filepath) g_free(dir); if (!created) { - g_free (maildir_path); - return FALSE; + retval = FALSE; } } } g_free (maildir_path); - return TRUE; + return retval; } /** @@ -486,9 +527,9 @@ init_debug_g_type (void) gflags = 0; mflags = modest_runtime_get_debug_flags (); - if (mflags & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS) + if (mflags & MODEST_RUNTIME_DEBUG_OBJECTS) gflags |= G_TYPE_DEBUG_OBJECTS; - if (mflags & MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS) + if (mflags & MODEST_RUNTIME_DEBUG_SIGNALS) gflags |= G_TYPE_DEBUG_SIGNALS; g_type_init_with_debug_flags (gflags); @@ -510,23 +551,26 @@ init_debug_logging (void) static void init_i18n (void) { - const gchar* gettext_package; - /* Setup gettext, to use our .po files: */ - /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */ -/* #ifdef MODEST_HILDON_VERSION_0 */ -/* gettext_package = GETTEXT_PACKAGE; */ -/* bindtextdomain (gettext_package, MODEST_LOCALE_DIR); */ -/* #else */ -/* gettext_package = "osso-email"; /\* HACK to use the localizations *\/ */ -/* bindtextdomain (gettext_package, "/usr/share/locale"); */ -/* #endif /\*MODEST_HILDON_VERSION_0*\/ */ - - gettext_package = GETTEXT_PACKAGE; - - bind_textdomain_codeset (gettext_package, "UTF-8"); - textdomain (gettext_package); + /* 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"); + + if (!lc_messages) { + setenv ("LANGUAGE", "en_GB", 1); + setenv ("LC_MESSAGES", "en_GB", 1); + } else { + gchar *language = g_strdup_printf ("%s:en_GB", lc_messages); + setenv ("LANGUAGE", language, 1); + g_free (language); + } + /* end of little trick */ - setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); } @@ -579,7 +623,7 @@ init_stock_icons (void) /* MODEST_TOOLBAR_ICON_NEXT, */ /* MODEST_TOOLBAR_ICON_PREV, */ /* MODEST_TOOLBAR_ICON_STOP */ - MODEST_TOOLBAR_ICON_FORMAT_BULLETS, +/* MODEST_TOOLBAR_ICON_FORMAT_BULLETS, */ }; registered = TRUE; @@ -618,7 +662,7 @@ init_stock_icons (void) g_object_unref (transparent); } else - g_warning ("failed to load %s icon", items_names[i]); + g_warning ("Modest: %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); @@ -629,21 +673,32 @@ init_stock_icons (void) 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); + /* Show toolbar keys */ + if (!modest_conf_key_exists (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR, TRUE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL); + + if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, NULL)) + modest_conf_set_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, TRUE, NULL); - if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL)) - modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL); + if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL)) + 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); + 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); + + /* Editor keys */ 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); - /* Global settings */ if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_UPDATE, NULL)) modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);