X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=563fe2992bd3ea32e68f3442a111bc19293251ad;hp=7ff8e9a1a5e01e00fcccfc0cd0c18e07bc161161;hb=8b08d2fd3eebc0584a5c49abdcd26c52b65737f0;hpb=db884009546eaa55ea71bcd46db03931dff08b98

diff --git a/src/modest-main.c b/src/modest-main.c
index 7ff8e9a..563fe29 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -32,14 +32,68 @@
 #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>
+
+ static gboolean
+on_idle_exit_modest (gpointer data)
+{
+	/* Protect the Gtk calls */
+	gdk_threads_enter ();
+
+	/* Wait for remaining tasks */
+	while (gtk_events_pending ())
+		gtk_main_iteration ();
+
+	gtk_main_quit ();
+
+	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 */
+	if (modest_window_mgr_num_windows (mgr) == 0)
+		g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, NULL, 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, NULL, NULL);
+}
 
 int
 main (int argc, char *argv[])
 {
-	ModestWindow *win;
+	/* 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;
+
+	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);
@@ -47,7 +101,13 @@ main (int argc, char *argv[])
 	gdk_threads_init ();
 	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;
@@ -59,28 +119,50 @@ main (int argc, char *argv[])
 		goto cleanup;
 	}
 
-	win = modest_main_window_new ();
-	gtk_widget_show_all (GTK_WIDGET(win));
-		
-	if (!win) {
-		g_printerr ("modest: failed to create main window\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);
+
+	/* 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.
+	 * 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) {
+		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;
+		}
 	
-	modest_window_mgr_register_window (modest_runtime_get_window_mgr(), 
-					   win);
-	g_object_unref (win);
+		gtk_widget_show_all (GTK_WIDGET(main_win));
+
+		/* Remove new mail notifications if exist */
+		modest_platform_remove_new_mail_notifications (FALSE);
+	}
 	
-	gtk_main ();	
-	retval = 1;
+	gtk_main ();
 
 cleanup:
 	gdk_threads_leave ();
 
-	if (!modest_init_uninit ()) 
+	if (!modest_init_uninit ()) {
 		g_printerr ("modest: modest_init_uninit failed\n");
-	
+		retval = 1;
+	}
+
 	return retval;
 }
-