#include <widgets/modest-main-window.h>
#include <string.h>
+typedef struct {
+ gulong queue_handler;
+ gulong window_list_handler;
+} MainSignalHandlers;
+
static gboolean
on_idle_exit_modest (gpointer data)
{
+ MainSignalHandlers *handlers;
+ ModestMailOperationQueue *mail_op_queue;
+
/* Protect the Gtk calls */
gdk_threads_enter ();
-
- /* 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);
+ /* Wait for remaining tasks */
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+
+ g_free (handlers);
+
+ 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;
{
ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
- /* Exit if the queue is empty and there are no more windows */
+ /* 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, NULL, NULL);
+ g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
}
static void
/* 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, NULL, NULL);
+ g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
}
int
* command line.: */
gboolean show_ui_without_top_application_method = FALSE;
int retval = 0;
+ MainSignalHandlers *handlers;
if (argc >= 2) {
if (strcmp (argv[1], "showui") == 0)
}
if (!show_ui_without_top_application_method) {
- g_print ("modest: not showing UI\n");
- g_print ("modest: use 'modest showui' to start with UI\n");
+ g_print ("modest: use 'modest showui' to start from cmdline with UI\n");
}
if (!g_thread_supported())
}
/* Connect to the queue-emtpy signal */
- g_signal_connect (modest_runtime_get_mail_operation_queue (),
- "queue-empty",
- G_CALLBACK (on_queue_empty),
- NULL);
-
- g_signal_connect (modest_runtime_get_window_mgr (),
- "window-list-empty",
- G_CALLBACK (on_window_list_empty),
- NULL);
+ handlers = g_malloc0 (sizeof (MainSignalHandlers));
+ handlers->queue_handler =
+ g_signal_connect (modest_runtime_get_mail_operation_queue (),
+ "queue-empty",
+ G_CALLBACK (on_queue_empty),
+ handlers);
+
+ handlers->window_list_handler =
+ g_signal_connect (modest_runtime_get_window_mgr (),
+ "window-list-empty",
+ G_CALLBACK (on_window_list_empty),
+ handlers);
/* 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,
gtk_widget_show_all (GTK_WIDGET(main_win));
/* Remove new mail notifications if exist */
- modest_platform_remove_new_mail_notifications ();
+ modest_platform_remove_new_mail_notifications (FALSE);
}
gtk_main ();
cleanup:
gdk_threads_leave ();
- /* Remove new mail notifications if exist */
-/* modest_platform_remove_new_mail_notifications (); */
-
if (!modest_init_uninit ()) {
g_printerr ("modest: modest_init_uninit failed\n");
retval = 1;