X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=3ed807631cfd91f02345372b58be7c97937ed643;hp=8d585945a001971492ae33431d69c1da46a1a985;hb=930a2c61d481d3f1d1d0cdb3dd8b03d5b6b87bd1;hpb=d2ccacc82b0f9d49e38cccb7aa227e31e7f29995 diff --git a/src/modest-main.c b/src/modest-main.c index 8d58594..3ed8076 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -27,287 +27,83 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include -#include -#include -#include -#include -#include -#include -#include - #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#if MODEST_PLATFORM_ID==2 /* maemo */ -#include -#endif /* MODEST_PLATFORM==2 */ -/* return values */ -enum { - MODEST_ERR_NONE = 0, - MODEST_ERR_OPTIONS, - MODEST_ERR_CONF, - MODEST_ERR_UI, - MODEST_ERR_HILDON, - MODEST_ERR_RUN, - MODEST_ERR_SEND, - MODEST_ERR_INIT, -}; - -static gboolean hildon_init (); /* NOP if HILDON is not defined */ -static int start_ui (const gchar* mailto, const gchar *cc, - const gchar *bcc, const gchar* subject, const gchar *body, - TnyAccountStore *account_store); - -static int send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); +#include +#include +#include +#include +#include +#include int main (int argc, char *argv[]) { - GOptionContext *context = NULL; - TnyPlatformFactory *fact = NULL; - TnyAccountStore *account_store = NULL; - ModestConf *modest_conf = NULL; + /* Usually we don't show the application at first, + * because we wait for the top_application D-Bus method to + * be called. But that's annoying when starting from the + * command line.: */ + gboolean show_ui_without_top_application_method = FALSE; + if (argc >= 2) { + printf ("DEBUG: %s: argv[1]=%s\n", __FUNCTION__, argv[1]); + if (strcmp (argv[1], "showui") == 0) + show_ui_without_top_application_method = TRUE; + } - GError *err = NULL; - int retval = MODEST_ERR_NONE; + ModestWindow *win; + int retval = 0; - static gboolean batch=FALSE, factory_settings=FALSE; - static gchar *mailto, *subject, *bcc, *cc, *body, *account; - - static GOptionEntry options[] = { - { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, - N_("New email to (comma-separated)"), NULL}, - { "subject", 's', 0, G_OPTION_ARG_STRING, &subject, - N_("Subject for a new mail"), NULL}, - { "body", 'b', 0, G_OPTION_ARG_STRING, &body, - N_("Body for a new email"), NULL}, - { "cc", 'c', 0, G_OPTION_ARG_STRING, &cc, - N_("Cc: addresses for a new mail (comma-separated)"), NULL}, - { "bcc", 'x', 0, G_OPTION_ARG_STRING, &bcc, - N_("Bcc: addresses for a new mail (comma-separated)"), NULL}, - { "account", 'a', 0, G_OPTION_ARG_STRING, &account, - N_("Account to use (if specified, default account is used)"), NULL}, - { "batch", 'y', 0, G_OPTION_ARG_NONE, &batch, - N_("Run in batch mode (don't show UI)"), NULL}, - { "factory-settings", 0, 0, G_OPTION_ARG_NONE, &factory_settings, - N_("return to factory settings"), NULL}, - { NULL, 0, 0, 0, NULL, NULL, NULL } - }; + if (!g_thread_supported()) + g_thread_init (NULL); - bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); + gdk_threads_init (); + gdk_threads_enter (); - modest_debug_g_type_init (); - modest_debug_logging_init (); - - g_thread_init (NULL); - - context = g_option_context_new (NULL); - g_option_context_add_main_entries (context, options, NULL); - - if (!g_option_context_parse (context, &argc, &argv, &err)) { - g_printerr ("modest: error in command line parameter(s): '%s', exiting\n", - err ? err->message : ""); - g_error_free (err); - retval = MODEST_ERR_OPTIONS; + if (!gtk_init_check(&argc, &argv)) { + g_printerr ("modest: failed to initialize gtk\n"); + retval = 1; goto cleanup; } - g_option_context_free (context); - - /* Get platform factory */ - fact = modest_tny_platform_factory_get_instance (); - /* Check modest conf */ - modest_conf = modest_tny_platform_factory_get_conf_instance - (MODEST_TNY_PLATFORM_FACTORY(fact)); - if (!modest_conf) { - g_printerr ("modest: failed to initialize config system, exiting\n"); - retval = MODEST_ERR_CONF; + if (!modest_init (argc, argv)) { + g_printerr ("modest: cannot init modest\n"); + retval = 1; goto cleanup; } - if (!modest_init_local_folders ()) { - g_printerr ("modest: failed to initialize local folders, exiting\n"); - retval = MODEST_ERR_INIT; - goto cleanup; - } - - /* Get the account store */ - account_store = tny_platform_factory_new_account_store (fact); - if (!account_store) { - g_printerr ("modest: could not initialize a ModestTnyAccountStore instance\n"); - retval = MODEST_ERR_RUN; - goto cleanup; - } + win = modest_main_window_new (); - - if (!getenv("DISPLAY")) - batch = TRUE; - - if (!batch) { - gdk_threads_init (); - gtk_init (&argc, &argv); - modest_init_header_columns (factory_settings); + /* Usually, we only show the UI when we get the "top_application" D-Bus method. + * This allows modest to start via D-Bus activation to provide a service, + * without showing the UI. + * The UI will be shown later (or just after starting if no otehr D-Bus method was used), + * when we receive the "top_application" D-Bus method. + */ + if (show_ui_without_top_application_method) + gtk_widget_show_all (GTK_WIDGET(win)); - retval = start_ui (mailto, cc, bcc, subject, body, account_store); - } else - retval = send_mail (mailto, cc, bcc, subject, body); - -cleanup: - if (fact) - g_object_unref (G_OBJECT(fact)); - /* this will clean up account_store as well */ - - return retval; -} - - -static int -start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body, - TnyAccountStore *account_store) -{ - ModestUI *modest_ui; - ModestWindow *win; - gint retval = 0; - - modest_ui = MODEST_UI(modest_ui_new (account_store)); - if (!modest_ui) { - g_printerr ("modest: failed to initialize ui, exiting\n"); - retval = MODEST_ERR_UI; + if (!win) { + g_printerr ("modest: failed to create main window\n"); + retval = 1; goto cleanup; } - modest_icon_factory_init (); - - if (!hildon_init ()) { /* NOP if hildon is not defined */ - g_printerr ("modest: failed to initialize hildon, exiting\n"); - retval = MODEST_ERR_HILDON; - goto cleanup; - } - - if (mailto||cc||bcc||subject||body) { - -/* ok = modest_ui_new_edit_window (modest_ui, */ -/* mailto, /\* to *\/ */ -/* cc, /\* cc *\/ */ -/* bcc, /\* bcc *\/ */ -/* subject, /\* subject *\/ */ -/* body, /\* body *\/ */ -/* NULL); /\* attachments *\/ */ - } else - win = modest_ui_main_window (modest_ui); - - if (win) { - TnyDevice *device; - - gtk_widget_show (GTK_WIDGET (win)); + modest_window_mgr_register_window (modest_runtime_get_window_mgr(), + win); + g_object_unref (win); - /* Go online */ - device = tny_account_store_get_device (account_store); - tny_device_force_online (device); - g_object_unref (G_OBJECT (device)); + gtk_main (); + retval = 0; - gtk_main(); - } cleanup: - if (modest_ui) - g_object_unref (modest_ui); - - modest_icon_factory_uninit (); - return retval; -} - - -static gboolean -hildon_init () -{ -#if MODEST_PLATFORM_ID==2 - - osso_context_t *osso_context = - osso_initialize(PACKAGE, PACKAGE_VERSION, - TRUE, NULL); - if (!osso_context) { - g_printerr ("modest: failed to acquire osso context\n"); - return FALSE; - } - -#endif /* MODEST_PLATFORM_ID==2 */ - - return TRUE; -} - - - -static int -send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body) -{ - ModestAccountMgr *acc_mgr = NULL; - TnyPlatformFactory *fact = NULL; - TnyAccountStore *acc_store = NULL; - ModestMailOperation *mail_operation = NULL; - - TnyList *accounts = NULL; - TnyIterator *iter = NULL; - TnyTransportAccount *account = NULL; - int retval; - - fact = modest_tny_platform_factory_get_instance (); - acc_mgr = modest_tny_platform_factory_get_account_mgr_instance - (MODEST_TNY_PLATFORM_FACTORY(fact)); - acc_store = tny_platform_factory_new_account_store (fact); - - accounts = TNY_LIST(tny_simple_list_new ()); - tny_account_store_get_accounts (TNY_ACCOUNT_STORE(acc_store), accounts, - TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); + gdk_threads_leave (); - iter = tny_list_create_iterator(accounts); - tny_iterator_first (iter); - if (tny_iterator_is_done (iter)) { - g_printerr("modest: no transport accounts defined\n"); - retval = MODEST_ERR_SEND; - goto cleanup; + if (!modest_init_uninit ()) { + g_printerr ("modest: modest_init_uninit failed\n"); + retval = 1; } - account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current(iter)); - - mail_operation = modest_mail_operation_new (); - - modest_mail_operation_send_new_mail (mail_operation, - account, "test@example.com", - mailto, cc, bcc, - subject, body, NULL); - - - if (modest_mail_operation_get_status (mail_operation) == - MODEST_MAIL_OPERATION_STATUS_FAILED) { - retval = MODEST_ERR_SEND; - goto cleanup; - } else - retval = MODEST_ERR_NONE; /* hurray! */ - -cleanup: - if (iter) - g_object_unref (G_OBJECT (iter)); - if (accounts) - g_object_unref (G_OBJECT (accounts)); - if (mail_operation) - g_object_unref (G_OBJECT (mail_operation)); + g_debug ("closing modest with retval %d", retval); return retval; }