-
- /* 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);
+ }