*/
#include <config.h>
-
-#include <glib.h>
-#include <modest-runtime.h>
-#include <modest-init.h>
-#include "modest-platform.h"
#include <gdk/gdk.h>
-#include <widgets/modest-main-window.h>
#include <string.h>
+#include <glib.h>
+#include "modest-runtime.h"
+#include "modest-init.h"
+#include "modest-platform.h"
+#include "modest-ui-actions.h"
+
+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 ();
-
- /* 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 ();
{
ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
- /* Exit if the queue is empty and there are no more windows */
- if (modest_window_mgr_num_windows (mgr) == 0)
- g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, NULL, NULL);
+ /* 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_get_num_windows (mgr) == 0)
+ 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
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;
}
-
+
+ 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 ();
+ 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;
}
- /* 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));
+ /* 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,
* 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 ();
+ 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;
projects / modest / blobdiff