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 (int argc, char *argv[])
+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();
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(argc, argv)) {
modest_init_uninit ();
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 */
+ /* Init notification system */
#ifdef MODEST_HAVE_HILDON_NOTIFY
notify_init ("Basics");
#endif
-
-
return TRUE;
}
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))