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
*/
};
#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;
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");
g_printerr ("modest: failed to init ui\n");
return FALSE;
}
-
- return TRUE;
+
+ return _is_initialized = TRUE;
}
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 (gnome_vfs_initialized())
- gnome_vfs_shutdown ();
-
+ _is_initialized = FALSE;
return TRUE;
}
*/
gchar *dir = g_build_filename (maildir_path,
- "Archive", NULL);
+ modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_ARCHIVE),
+ NULL);
const gboolean created = modest_init_one_local_folder (dir);
g_free(dir);
{ MODEST_STOCK_NEW_MAIL, "new mail", 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_REPLY_ALL, "reply all", 0, 0, NULL }, */
+/* { MODEST_STOCK_FORWARD, "forward", 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_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_REPLY_ALL, */
+/* MODEST_TOOLBAR_ICON_FORWARD, */
MODEST_TOOLBAR_ICON_DELETE,
/* MODEST_TOOLBAR_ICON_NEXT, */
/* MODEST_TOOLBAR_ICON_PREV, */
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_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, NULL))
+ modest_conf_set_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, 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);
-/* Not used:
- 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);