X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=19cebd63751bb002df3280bfb407c8df869a17cf;hp=2bd05ff626e0a139dbecd5e9fb0a5e993a893fb9;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=0c15b90703f7f725311a748e2fd65e5eab3ead2d diff --git a/src/modest-main.c b/src/modest-main.c index 2bd05ff..19cebd6 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -28,225 +28,182 @@ */ #include - +#include +#include #include -#include -#include - -#include -#include -#include -#include -#include - #include -#include -#include -#include -#include -#include -#include -#include -#include - +#include +#include "modest-platform.h" +#include "modest-ui-actions.h" #include -#include - -typedef enum { - MODEST_ERR_NONE = 0, /* no error */ - MODEST_ERR_OPTIONS = 1, /* error in the options */ - MODEST_ERR_CONF = 2, /* error getting confuration db */ - MODEST_ERR_UI = 3, /* error in the UI */ - MODEST_ERR_HILDON = 4, /* error with Hildon (maemo-only) */ - MODEST_ERR_RUN = 5, /* error running */ - MODEST_ERR_SEND = 6, /* error sending mail */ - MODEST_ERR_PARAM = 7, /* error in one or more of the parameters */ - MODEST_ERR_INIT = 8 /* error in initialization */ -} ModestErrorCode; - -static gchar* check_account (const gchar *account); - -static ModestErrorCode start_ui (const gchar *account, - const gchar* mailto, const gchar *cc, - const gchar *bcc, const gchar* subject, const gchar *body); - -static ModestErrorCode 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[]) + +typedef struct { + gulong queue_handler; + gulong window_list_handler; + gulong get_password_handler; +} MainSignalHandlers; + +static gboolean +on_idle_exit_modest (gpointer data) { - GOptionContext *context = NULL; - - GError *err = NULL; - int retval = MODEST_ERR_NONE; + MainSignalHandlers *handlers; + ModestMailOperationQueue *mail_op_queue; + + /* Protect the Gtk calls */ + gdk_threads_enter (); + mail_op_queue = modest_runtime_get_mail_operation_queue (); + + if (modest_mail_operation_queue_running_shutdown (mail_op_queue)) { + + /* Disconnect signals. Will be freed by the destroy notify */ + handlers = (MainSignalHandlers *) data; + g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (), + handlers->queue_handler); + g_signal_handler_disconnect (modest_runtime_get_window_mgr (), + handlers->window_list_handler); + g_signal_handler_disconnect (modest_runtime_get_account_store (), + handlers->get_password_handler); + g_free (handlers); + + /* Wait for remaining tasks */ + while (gtk_events_pending ()) + gtk_main_iteration (); - static gboolean batch = FALSE; - static gchar *mailto=NULL, *subject=NULL, *bcc=NULL, - *cc=NULL, *body=NULL, *account=NULL; - gchar *account_or_default; - 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 (!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; - goto cleanup; - } - g_option_context_free (context); - - account_or_default = check_account (account); - g_free (account); - - 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 (account_or_default, - mailto, cc, bcc, subject, body); + gtk_main_quit (); } else { - retval = send_mail (account_or_default, - mailto, cc, bcc, subject, body); + ModestMailOperation *mail_op; + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (mail_op_queue, mail_op); + modest_mail_operation_shutdown (mail_op, modest_runtime_get_account_store ()); + g_object_unref (mail_op); } - -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"); + + gdk_threads_leave (); - return retval; + return FALSE; } +static void +on_queue_empty (ModestMailOperationQueue *queue, + gpointer user_data) +{ + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); + + /* Exit if the queue is empty and there are no more + windows. We can exit as well if the main window is hidden + and it's the only one */ + if (modest_window_mgr_num_windows (mgr) == 0) + g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL); +} -static ModestErrorCode -start_ui (const gchar *account, const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body) +static void +on_window_list_empty (ModestWindowMgr *window_mgr, + gpointer user_data) { - ModestWindow *win = NULL; + ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue (); - if (mailto||cc||bcc||subject||body) { - gchar *from; - TnyMsg *msg; + /* Exit if there are no more windows and the queue is empty */ + if (modest_mail_operation_queue_num_elements (queue) == 0) + g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL); +} - if (!account) { - g_printerr ("modest: no valid account provided, nor is default one available\n"); - return MODEST_ERR_PARAM; - } - from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account); - msg = modest_tny_msg_new (mailto,from,cc,bcc,subject,body,NULL); - - win = modest_msg_edit_window_new (msg, account); +int +main (int argc, char *argv[]) +{ + /* 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; + int retval = 0; + MainSignalHandlers *handlers; + + if (argc >= 2) { + if (strcmp (argv[1], "showui") == 0) + show_ui_without_top_application_method = TRUE; + } + + if (!show_ui_without_top_application_method) { + g_print ("modest: use 'modest showui' to start from cmdline with UI\n"); + } - g_object_unref (G_OBJECT(msg)); - g_free (from); - } else - win = modest_main_window_new (); - - if (!win) { - g_printerr ("modest: failed to create window\n"); - return MODEST_ERR_UI; + if (!g_thread_supported()) + g_thread_init (NULL); + + gdk_threads_init (); + gdk_threads_enter (); + + if (!getenv("DISPLAY")) { + g_printerr ("modest: DISPLAY env variable is not set\n"); + retval = 1; + goto cleanup; } - gtk_widget_show_all (GTK_WIDGET (win)); - gtk_main(); - - return MODEST_ERR_NONE; -} + if (!gtk_init_check (&argc, &argv)) { + g_printerr ("modest: failed to initialize gtk\n"); + retval = 1; + goto cleanup; + } -static gchar* -check_account (const gchar* account) -{ - gchar *retval; - ModestAccountMgr *account_mgr; - - account_mgr = modest_runtime_get_account_mgr(); - - if (!account) - retval = modest_account_mgr_get_default_account (account_mgr); - else - retval = g_strdup (account); - - /* sanity check */ - if (!account || !modest_account_mgr_account_exists (account_mgr, account, FALSE)) { - g_free (retval); - retval = NULL; + if (!modest_init (argc, argv)) { + g_printerr ("modest: cannot init modest\n"); + retval = 1; + goto cleanup; } - return retval; -} -static ModestErrorCode -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; + handlers = g_malloc0 (sizeof (MainSignalHandlers)); + /* Connect to the "queue-emtpy" signal */ + handlers->queue_handler = + g_signal_connect (modest_runtime_get_mail_operation_queue (), + "queue-empty", + G_CALLBACK (on_queue_empty), + handlers); + + /* Connect to the "window-list-emtpy" signal */ + handlers->window_list_handler = + g_signal_connect (modest_runtime_get_window_mgr (), + "window-list-empty", + G_CALLBACK (on_window_list_empty), + handlers); + + /* Connect to the "password-requested" signal */ + handlers->get_password_handler = + g_signal_connect (modest_runtime_get_account_store (), + "password_requested", + G_CALLBACK (modest_ui_actions_on_password_requested), + NULL); + + /* 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) { + ModestWindow *main_win; + + /* this will create & register the window */ + main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), + TRUE); + if (!main_win) { + g_printerr ("modest: failed to get main window instance\n"); + retval = 1; + goto cleanup; + } - g_return_val_if_fail (account_name, MODEST_ERR_SEND); - - 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; + /* Remove new mail notifications if exist */ + modest_platform_remove_new_mail_notifications (FALSE); } - 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_object_unref (G_OBJECT(account)); - g_object_unref (G_OBJECT(mail_operation)); - g_free (from_string); + gtk_main (); + +cleanup: + gdk_threads_leave (); + + if (!modest_init_uninit ()) { + g_printerr ("modest: modest_init_uninit failed\n"); + retval = 1; + } + return retval; } - -