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);
/*
* defaults for the column headers
return result;
}
+
gboolean
-modest_init_init_core (void)
+modest_init (int argc, char *argv[])
{
gboolean reset;
static gboolean invoked = FALSE;
return FALSE;
} else
invoked = TRUE;
-
+
init_i18n();
init_debug_g_type();
init_debug_logging();
+
+ 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;
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");
+ return FALSE;
}
return 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()); */
/* 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;
}
{
if (!modest_runtime_uninit())
g_printerr ("modest: failed to uninit runtime\n");
-
+
+ if (gnome_vfs_initialized())
+ gnome_vfs_shutdown ();
+
return TRUE;
}
* there was nothing before */
if (!overwrite && modest_conf_key_exists(conf, key, NULL)) {
g_free (key);
+ g_free (sort_key);
return TRUE;
}
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;
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.
g_free(dir);
if (!created) {
- g_free (maildir_path);
- return FALSE;
+ retval = FALSE;
}
}
}
g_free (maildir_path);
- return TRUE;
+ return retval;
}
/**
{ 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, */
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);
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))
projects / modest / blobdiff