X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=19cebd63751bb002df3280bfb407c8df869a17cf;hp=52ad08b1e22452bccdd856ea7ab4127ae2be1118;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=d0a955dfd04c1707ecd486a8426112714990b84c diff --git a/src/modest-main.c b/src/modest-main.c index 52ad08b..19cebd6 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -28,13 +28,84 @@ */ #include - +#include +#include #include #include #include -#include +#include "modest-platform.h" +#include "modest-ui-actions.h" #include -#include + +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_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 (); + + 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 void +on_window_list_empty (ModestWindowMgr *window_mgr, + gpointer user_data) +{ + ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue (); + + /* 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[]) @@ -44,22 +115,31 @@ main (int argc, char *argv[]) * 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) { - printf ("DEBUG: %s: argv[1]=%s\n", __FUNCTION__, argv[1]); if (strcmp (argv[1], "showui") == 0) show_ui_without_top_application_method = TRUE; } - - ModestWindow *win; - int retval = 0; + + 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); gdk_threads_init (); - gdk_threads_enter (); /* CHECKED */ + gdk_threads_enter (); - if (!gtk_init_check(&argc, &argv)) { + if (!getenv("DISPLAY")) { + g_printerr ("modest: DISPLAY env variable is not set\n"); + retval = 1; + goto cleanup; + } + + if (!gtk_init_check (&argc, &argv)) { g_printerr ("modest: failed to initialize gtk\n"); retval = 1; goto cleanup; @@ -71,37 +151,59 @@ main (int argc, char *argv[]) goto cleanup; } - /* this will create & register the window */ - win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr()); - if (!win) { - g_printerr ("modest: failed to get main window instance\n"); - retval = 1; - goto cleanup; - } - + 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, + * 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 (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; + } + /* Remove new mail notifications if exist */ + modest_platform_remove_new_mail_notifications (FALSE); + } - gtk_main (); - retval = 0; + gtk_main (); cleanup: - gdk_threads_leave (); /* CHECKED */ + gdk_threads_leave (); if (!modest_init_uninit ()) { g_printerr ("modest: modest_init_uninit failed\n"); retval = 1; } - g_debug ("closing modest with retval %d", retval); - return retval; } -