X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=19ceda677edd527865dbf716f381126bdc9e4b04;hp=d79db1f35b0d1d4787cc71298d4f5d227a360c36;hb=HEAD;hpb=1d54dd2435d706f0f82d2a81cd00c1410832a241 diff --git a/src/modest-main.c b/src/modest-main.c index d79db1f..19ceda6 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -27,238 +27,210 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - +#include +#include +#include #include -#include -#include -#include +#include "modest-runtime.h" +#include "modest-init.h" +#include "modest-platform.h" +#include "modest-ui-actions.h" -#include -#include -#include +static gboolean show_ui = FALSE; +static GOptionEntry option_entries [] = +{ + { "show-ui", 's', 0, G_OPTION_ARG_NONE, &show_ui, "Show UI immediately, so no wait for DBUS activation", NULL }, + { NULL } +}; -#include "modest-conf.h" -#include "modest-account-mgr.h" -#include "modest-ui.h" -#include "modest-icon-factory.h" -#include "modest-tny-transport-actions.h" -#include "modest-tny-account-store.h" -#include "modest-tny-platform-factory.h" +typedef struct { + gulong queue_handler; + gulong window_list_handler; + gulong get_password_handler; +} MainSignalHandlers; +static gboolean +on_idle_exit_modest (gpointer data) +{ + MainSignalHandlers *handlers; + ModestMailOperationQueue *mail_op_queue; + + /* Protect the Gtk calls */ + gdk_threads_enter (); + mail_op_queue = modest_runtime_get_mail_operation_queue (); + + if (modest_tny_account_store_is_shutdown (modest_runtime_get_account_store ()) && + 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 (); + + gtk_main_quit (); + } else { + 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); + } -#ifdef MODEST_ENABLE_HILDON /* Hildon includes */ -#include -#endif /* MODEST_ENABLE_HILDON */ + gdk_threads_leave (); -/* return values */ -#define MODEST_ERR_NONE 0 -#define MODEST_ERR_OPTIONS 1 -#define MODEST_ERR_CONF 2 -#define MODEST_ERR_UI 3 -#define MODEST_ERR_HILDON 4 -#define MODEST_ERR_RUN 5 -#define MODEST_ERR_SEND 6 + return FALSE; +} -static gboolean hildon_init (); /* NOP if HILDON is not defined */ +static void +on_queue_empty (ModestMailOperationQueue *queue, + gpointer user_data) +{ + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); + + if (!modest_runtime_get_allow_shutdown ()) + return; -static int start_ui (const gchar* mailto, const gchar *cc, - const gchar *bcc, const gchar* subject, const gchar *body); + /* 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_get_num_windows (mgr) == 0) + g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL); +} + +static void +on_window_list_empty (ModestWindowMgr *window_mgr, + gpointer user_data) +{ + ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue (); -static int send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); + if (!modest_runtime_get_allow_shutdown ()) + return; + + /* 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); +} int main (int argc, char *argv[]) { - GOptionContext *context = NULL; - TnyPlatformFactory *fact = NULL; - ModestConf *modest_conf = NULL; - - GError *err = NULL; - int retval = MODEST_ERR_NONE; - - static gboolean debug=FALSE, batch=FALSE; - static gchar *mailto, *subject, *bcc, *cc, *body; - - static GOptionEntry options[] = { - { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, - "Run in debug mode", NULL}, - { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, - "New email to (comma-separated)", NULL}, - { "subject", 's', 0, G_OPTION_ARG_STRING, &subject, - "Subject for a new mail", NULL}, - { "body", 'b', 0, G_OPTION_ARG_STRING, &body, - "Body for a new email", NULL}, - { "cc", 'c', 0, G_OPTION_ARG_STRING, &cc, - "Cc: addresses for a new mail (comma-separated)", NULL}, - { "bcc", 'x', 0, G_OPTION_ARG_STRING, &bcc, - "Bcc: addresses for a new mail (comma-separated)", NULL}, - { "batch", 'y', 0, G_OPTION_ARG_NONE, &batch, - "Run in batch mode (don't show UI)", NULL}, - { NULL, 0, 0, 0, NULL, NULL, NULL } - }; - - g_type_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); - retval = MODEST_ERR_OPTIONS; - goto cleanup; + /* 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.: */ + int retval = 0; + MainSignalHandlers *handlers; + ModestTnyAccountStore *acc_store; + + GError *error = NULL; + GOptionContext *context; + + ModestWindowMgr *mgr; + + context = g_option_context_new ("- Modest email client"); + g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + if (!g_option_context_parse (context, &argc, &argv, &error)) { + g_print ("option parsing failed: %s\n", error->message); + g_option_context_free (context); + exit (1); } g_option_context_free (context); - - fact = modest_tny_platform_factory_get_instance (); - modest_conf = modest_tny_platform_factory_get_modest_conf_instance (fact); - if (!modest_conf) { - g_printerr ("modest: failed to initialize config system, exiting\n"); - retval = MODEST_ERR_CONF; - goto cleanup; - } - if (debug) - g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING); - - if (!getenv("DISPLAY")) - batch = TRUE; - - if (!batch) { - gtk_init (&argc, &argv); - retval = start_ui (mailto, cc, bcc, subject, body); - } else - retval = send_mail (mailto, cc, bcc, subject, body); - - -cleanup: - - return retval; -} + if (!show_ui) { + g_print ("modest: use 'modest -s' to start from cmdline with UI\n"); + } + if (!g_thread_supported()) + g_thread_init (NULL); -static int -start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body) -{ + gdk_threads_init (); + gdk_threads_enter (); - ModestUI *modest_ui; - gint retval = 0; - - #ifndef OLD_UI_STUFF - GtkWidget *win; - #endif - - modest_ui = MODEST_UI(modest_ui_new ()); - if (!modest_ui) { - g_printerr ("modest: failed to initialize ui, exiting\n"); - retval = MODEST_ERR_UI; + if (!getenv("DISPLAY")) { + g_printerr ("modest: DISPLAY env variable is not set\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; + if (!gtk_init_check (&argc, &argv)) { + g_printerr ("modest: failed to initialize gtk\n"); + retval = 1; 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 -#ifndef OLD_UI_STUFF - win = modest_ui_main_window (modest_ui); - gtk_widget_show (win); -#else - modest_ui_show_main_window (modest_ui); -#endif - gtk_main(); - -cleanup: - if (modest_ui) - g_object_unref (modest_ui); - - modest_icon_factory_uninit (); - return retval; -} - - -static gboolean -hildon_init () -{ -#ifdef MODEST_ENABLE_HILDON - - osso_context_t *osso_context = - osso_initialize(PACKAGE, PACKAGE_VERSION, - TRUE, NULL); - if (!osso_context) { - g_printerr ("modest: failed to aquire osso context, exiting\n"); - - return FALSE; - + if (!modest_init (argc, argv)) { + g_printerr ("modest: cannot init modest\n"); + retval = 1; + goto cleanup; } -#endif /* MODEST_ENABLE_HILDON */ - return TRUE; -} + /* Create the account store & launch send queues */ + acc_store = modest_runtime_get_account_store (); + modest_tny_account_store_start_send_queues (acc_store); + + 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 (acc_store, + "password_requested", + G_CALLBACK (modest_ui_actions_on_password_requested), + NULL); + + /* Create cached windows */ + mgr = modest_runtime_get_window_mgr (); + modest_window_mgr_create_caches (mgr); + + /* 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) { + ModestWindow *window; + + mgr = modest_runtime_get_window_mgr(); + window = modest_window_mgr_show_initial_window (mgr); + if (!window) { + g_printerr ("modest: failed to get main window instance\n"); + retval = 1; + goto cleanup; + } + } + gtk_main (); +cleanup: + gdk_threads_leave (); -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; - - 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_modest_account_mgr_instance (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); - - 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)); - - if (!modest_mail_operation_send_mail (account, - "djcb@djcbsoftware.nl", mailto, cc, bcc, subject, body, - NULL)) { - 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)); - return retval; } -