X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=3ed807631cfd91f02345372b58be7c97937ed643;hp=82aa982ee1b33a4cf345b5c54e9726accb366115;hb=930a2c61d481d3f1d1d0cdb3dd8b03d5b6b87bd1;hpb=8cb5d470d68036f3fc73156897144bafb83c78ef diff --git a/src/modest-main.c b/src/modest-main.c index 82aa982..3ed8076 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -30,206 +30,81 @@ #include #include -#include -#include - -#include -#include -#include -#include -#include - #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include -static gchar* check_account (const gchar *account); -static int start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); -static int send_mail (const gchar* account, - const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); int main (int argc, char *argv[]) { - GOptionContext *context = 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; - static gchar *mailto=NULL, *subject=NULL, *bcc=NULL, - *cc=NULL, *body=NULL, *account=NULL; - - 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 none specified, the default account will be used)"), NULL}, - { "batch", 'y', 0, G_OPTION_ARG_NONE, &batch, - N_("Run in batch mode (don't show UI)"), NULL}, - { NULL, 0, 0, 0, NULL, NULL, NULL } - }; + if (!g_thread_supported()) + g_thread_init (NULL); - if (!modest_runtime_init ()) { - g_printerr ("modest: cannot init runtime\n"); - return MODEST_ERR_INIT; - } - - 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); - g_option_context_free (context); - retval = MODEST_ERR_OPTIONS; + gdk_threads_init (); + gdk_threads_enter (); + + if (!gtk_init_check(&argc, &argv)) { + g_printerr ("modest: failed to initialize gtk\n"); + retval = 1; goto cleanup; } - g_option_context_free (context); - - if (!batch) { - if (!modest_runtime_init_ui (argc, argv)) { - g_printerr ("modest: cannot start UI\n"); - retval = MODEST_ERR_UI; - goto cleanup; - } else - retval = start_ui (mailto, cc, bcc, subject, body); - } else { - gchar *account_or_default; - account_or_default = check_account (account); - g_free (account); - if (!account_or_default) { - g_printerr ("modest: account is not valid\n"); - retval = MODEST_ERR_PARAM; - goto cleanup; - } - retval = send_mail (account, mailto, cc, bcc, subject, body); + if (!modest_init (argc, argv)) { + g_printerr ("modest: cannot init modest\n"); + retval = 1; + goto cleanup; } - -cleanup: - g_free (mailto); - g_free (subject); - g_free (bcc); - g_free (cc); - g_free (body); - g_free (account); - if (!modest_runtime_uninit ()) - g_printerr ("modest: modest_runtime_uninit failed\n"); - - return retval; -} - - -static int -start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body) -{ - ModestWindow *win = NULL; - ModestUI *modest_ui = NULL; - - gint retval = 0; - modest_ui = modest_ui_new (); + win = modest_main_window_new (); - if (mailto||cc||bcc||subject||body) { - g_warning ("FIXME: implement this"); -/* 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) { - gtk_widget_show_all (GTK_WIDGET (win)); - gtk_main(); + /* 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)); + + if (!win) { + g_printerr ("modest: failed to create main window\n"); + retval = 1; + goto cleanup; } - if (modest_ui) - g_object_unref (G_OBJECT(modest_ui)); - return retval; -} - -static gchar* -check_account (const gchar* account) -{ - gchar *retval; - ModestAccountMgr *account_mgr; - - account_mgr = modest_runtime_get_account_mgr(); + modest_window_mgr_register_window (modest_runtime_get_window_mgr(), + win); + g_object_unref (win); - if (!account) - retval = modest_account_mgr_get_default_account (account_mgr); - else - retval = g_strdup (account); + gtk_main (); + retval = 0; - /* sanity check */ - if (!modest_account_mgr_account_exists (account_mgr, account, FALSE, NULL)) { - g_free (retval); - retval = NULL; - } - return retval; -} - -static int -send_mail (const gchar* account_name, - const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body) -{ - int retval; - TnyTransportAccount *account; - ModestMailOperation *mail_operation = NULL; - gchar *from_string; - - g_return_val_if_fail (account_name, MODEST_ERR_SEND); +cleanup: + gdk_threads_leave (); - account = TNY_TRANSPORT_ACCOUNT (modest_tny_account_store_get_tny_account_by_account - (modest_runtime_get_account_store(), account_name, - TNY_ACCOUNT_TYPE_TRANSPORT)); - if (!account) { - g_printerr ("modest: no transport defined account for %s\n", - account_name); - return MODEST_ERR_SEND; + if (!modest_init_uninit ()) { + g_printerr ("modest: modest_init_uninit failed\n"); + retval = 1; } - from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), - account_name); - mail_operation = modest_mail_operation_new (); - modest_mail_operation_send_new_mail (mail_operation, account, - from_string, mailto, - cc, bcc, subject, body, - NULL); - if (modest_mail_operation_get_status (mail_operation) == - MODEST_MAIL_OPERATION_STATUS_FAILED) { - retval = MODEST_ERR_SEND; - } else - retval = MODEST_ERR_NONE; /* hurray! */ + g_debug ("closing modest with retval %d", retval); - g_object_unref (G_OBJECT(account)); - g_object_unref (G_OBJECT(mail_operation)); - g_free (from_string); - return retval; } -