X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=1d6bde686b04c78789545b5d59f55a14ce2e12c4;hp=2288c6f20baaeb1dfef0958f5ff43b65b56835d5;hb=431e6afaedd1f67abdca9e5bb7b14e5027401d00;hpb=9b64baa695619ea00024eddf134dab990b3347e9 diff --git a/src/modest-main.c b/src/modest-main.c index 2288c6f..1d6bde6 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -28,48 +28,61 @@ */ #include - -#include -#include -#include -#include "modest-platform.h" #include -#include #include +#include +#include "modest-runtime.h" +#include "modest-init.h" +#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; + gulong get_password_handler; } MainSignalHandlers; static gboolean on_idle_exit_modest (gpointer data) { - ModestWindow *main_win; - ModestWindowMgr *mgr; MainSignalHandlers *handlers; + ModestMailOperationQueue *mail_op_queue; /* Protect the Gtk calls */ gdk_threads_enter (); - - /* 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); - - /* If the main window is still there but hidden, then unregister it */ - mgr = modest_runtime_get_window_mgr(); - main_win = modest_window_mgr_get_main_window (mgr, FALSE); - if (main_win) - modest_window_mgr_unregister_window (mgr, main_win); - - /* Wait for remaining tasks */ - while (gtk_events_pending ()) - gtk_main_iteration (); - - gtk_main_quit (); + 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 (); + + 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); + } gdk_threads_leave (); @@ -80,17 +93,13 @@ static void on_queue_empty (ModestMailOperationQueue *queue, gpointer user_data) { - guint num_windows = 0; ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); - ModestWindow *main_win = modest_window_mgr_get_main_window (mgr, FALSE); /* 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 */ - num_windows = modest_window_mgr_num_windows (mgr); - if ((num_windows == 0) || - (num_windows == 1 && main_win && !GTK_WIDGET_VISIBLE (main_win))) - g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, g_free); + 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 @@ -101,29 +110,38 @@ on_window_list_empty (ModestWindowMgr *window_mgr, /* 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, g_free); + g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL); } 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 + /* 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; + GError *error; + GOptionContext *context; + + 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); + exit (1); } + + show_ui_without_top_application_method = show_ui; + if (!show_ui_without_top_application_method) { g_print ("modest: use 'modest showui' to start from cmdline with UI\n"); - } - + } + if (!g_thread_supported()) g_thread_init (NULL); @@ -135,7 +153,7 @@ main (int argc, char *argv[]) retval = 1; goto cleanup; } - + if (!gtk_init_check (&argc, &argv)) { g_printerr ("modest: failed to initialize gtk\n"); retval = 1; @@ -148,20 +166,28 @@ main (int argc, char *argv[]) goto cleanup; } - /* Connect to the queue-emtpy signal */ handlers = g_malloc0 (sizeof (MainSignalHandlers)); - handlers->queue_handler = + /* 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); - handlers->window_list_handler = + /* 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. @@ -169,23 +195,20 @@ main (int argc, char *argv[]) * when we receive the "top_application" D-Bus method. */ if (show_ui_without_top_application_method) { - ModestWindow *main_win; + ModestWindow *window; + ModestWindowMgr *mgr; - /* this will create & register the window */ - main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), - TRUE); - if (!main_win) { + 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_widget_show_all (GTK_WIDGET(main_win)); - /* Remove new mail notifications if exist */ modest_platform_remove_new_mail_notifications (FALSE); } - + gtk_main (); cleanup: