Modified webpage: now tinymail repository is in gitorious.

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index f84edf3..19ceda6 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -36,6 +36,13 @@
 #include "modest-platform.h"
 #include "modest-ui-actions.h"
 
+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 }
+};
+
 typedef struct {
        gulong queue_handler;
        gulong window_list_handler;
@@ -52,7 +59,8 @@ on_idle_exit_modest (gpointer data)
        gdk_threads_enter ();
        mail_op_queue = modest_runtime_get_mail_operation_queue ();
 
-       if (modest_mail_operation_queue_running_shutdown (mail_op_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;
@@ -88,6 +96,9 @@ on_queue_empty (ModestMailOperationQueue *queue,
 {
        ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 
+       if (!modest_runtime_get_allow_shutdown ())
+               return;
+
        /* 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 */
@@ -101,6 +112,9 @@ on_window_list_empty (ModestWindowMgr *window_mgr,
 {
        ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue ();
 
+       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);
@@ -113,17 +127,27 @@ main (int argc, char *argv[])
         * 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;
+       ModestTnyAccountStore *acc_store;
 
-       if (argc >= 2) {
-               if (strcmp (argv[1], "showui") == 0)
-                       show_ui_without_top_application_method = TRUE;
+       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);
 
-       if (!show_ui_without_top_application_method) {
-               g_print ("modest: use 'modest showui' to start from cmdline  with UI\n");
+       if (!show_ui) {
+               g_print ("modest: use 'modest -s' to start from cmdline  with UI\n");
        }
 
        if (!g_thread_supported())
@@ -150,6 +174,10 @@ main (int argc, char *argv[])
                goto cleanup;
        }
 
+       /* 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 =
@@ -167,20 +195,23 @@ main (int argc, char *argv[])
 
        /* Connect to the "password-requested" signal */
        handlers->get_password_handler =
-               g_signal_connect (modest_runtime_get_account_store (),
+               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_without_top_application_method) {
+       if (show_ui) {
                ModestWindow *window;
-               ModestWindowMgr *mgr;
 
                mgr = modest_runtime_get_window_mgr();
                window = modest_window_mgr_show_initial_window (mgr);
@@ -189,8 +220,6 @@ main (int argc, char *argv[])
                        retval = 1;
                        goto cleanup;
                }
-               /* Remove new mail notifications if exist */
-               modest_platform_remove_new_mail_notifications (FALSE);
        }
 
        gtk_main ();