X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=8a9fa577e43383944ede91d16c2c3aba6fb3c2ab;hp=06b627f7ca72aed4fdbf888d75ebe4622bf0e7aa;hb=0f4599a851ee136d2621628af5410fef2beac1ed;hpb=11167de1fe9a3278e224343c93b338f91f38eb89 diff --git a/src/modest-main.c b/src/modest-main.c index 06b627f..8a9fa57 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -30,249 +30,81 @@ #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 (ModestAccountMgr* account_mgr, const gchar *account); -TnyAccount* get_transport_account (ModestAccountMgr *account_mgr, - ModestAccountData *account_data, - 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; + if (!g_thread_supported()) + g_thread_init (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 } - }; + gdk_threads_init (); + gdk_threads_enter (); - 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; + 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 - retval = send_mail (account, mailto, cc, bcc, subject, body); - -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; -} + if (!modest_init (argc, argv)) { + g_printerr ("modest: cannot init modest\n"); + retval = 1; + goto cleanup; + } -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; + win = modest_main_window_new (); + + if (!win) { + g_printerr ("modest: failed to create main window\n"); + retval = 1; + goto cleanup; + } - gint retval = 0; - modest_ui = modest_ui_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); + /* 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) { - gtk_widget_show_all (GTK_WIDGET (win)); - gtk_main(); - } - if (modest_ui) - g_object_unref (G_OBJECT(modest_ui)); + modest_window_mgr_register_window (modest_runtime_get_window_mgr(), + win); + g_object_unref (win); - return retval; -} - - -static int -send_mail (const gchar* account_, - const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body) -{ - ModestAccountMgr *account_mgr; - ModestMailOperation *mail_operation = NULL; - TnyTransportAccount *account = NULL; - ModestAccountData *account_data; - gchar *account_name = NULL, *sender_name = NULL; - int retval; + gtk_main (); + retval = 0; - account_mgr = modest_runtime_get_account_mgr (); - - account_name = check_account (account_mgr, account_); - if (!account_name) - return MODEST_ERR_SEND; +cleanup: + gdk_threads_leave (); - account_data = modest_account_mgr_get_account_data (account_mgr, account_name); - if (!account_data) { - g_printerr ("modest: cannot get account data for %s\n", account_name); - g_free (account_name); - return MODEST_ERR_SEND; + if (!modest_init_uninit ()) { + g_printerr ("modest: modest_init_uninit failed\n"); + retval = 1; } - account = TNY_TRANSPORT_ACCOUNT(get_transport_account (account_mgr, account_data, - account_name)); - if (!account) { - g_printerr ("modest: cannot get transport account for %s\n", account_name); - g_free (account_name); - modest_account_mgr_free_account_data (account_mgr, account_data); - return MODEST_ERR_SEND; - } - - sender_name = g_strdup_printf ("%s <%s>", - account_data->fullname ? account_data->fullname : "", - account_data->email ? account_data->email : ""); - mail_operation = modest_mail_operation_new (); - modest_mail_operation_send_new_mail (mail_operation, - account, - sender_name, - mailto, - cc, bcc, subject, body, - NULL); + g_debug ("closing modest with retval %d", retval); - if (modest_mail_operation_get_status (mail_operation) == - MODEST_MAIL_OPERATION_STATUS_FAILED) { - retval = MODEST_ERR_SEND; - } else - retval = MODEST_ERR_NONE; /* hurray! */ - - g_free (sender_name); - g_free (account_name); - modest_account_mgr_free_account_data (account_mgr, account_data); - return retval; } - - - -static gchar* -check_account (ModestAccountMgr* account_mgr, const gchar *account) -{ - gchar *account_or_default; - - if (account) - account_or_default = g_strdup(account); - else { - account_or_default = modest_account_mgr_get_default_account (account_mgr); - if (!account_or_default) { - g_printerr ("modest: no default account has been defined\n"); - return NULL; - } - } - - if (!modest_account_mgr_account_exists (account_mgr, account_or_default, FALSE, NULL)) { - g_printerr ("modest: account %s is undefined\n", account_or_default); - return NULL; - } - - return account_or_default; -} - - -TnyAccount* -get_transport_account (ModestAccountMgr *account_mgr, - ModestAccountData *account_data, - const gchar *account_name) -{ - TnyAccount *account; - - if (!account_data->transport_account || !account_data->transport_account->account_name) { - g_printerr ("modest: no transport account defined for %s\n", account_name); - return NULL; - } - - account = (modest_tny_account_store_get_tny_account_from_server_account ( - modest_runtime_get_account_store(), - account_data->transport_account->account_name)); - - if (!TNY_IS_TRANSPORT_ACCOUNT(account)) { - g_printerr ("modest: no valid transport account defined for %s\n", account_name); - g_object_unref (G_OBJECT(account)); - return NULL; - } - - return account; -} - -