X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-main.c;h=563fe2992bd3ea32e68f3442a111bc19293251ad;hb=884742afe32007818e94c83980634f442c77a374;hp=4ca4f156650b3b85afe95d3be2ff8a1c5d839074;hpb=9a50aa1fcb88365c321552e395232846dfe06ea0;p=modest

diff --git a/src/modest-main.c b/src/modest-main.c
index 4ca4f15..563fe29 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -37,6 +37,45 @@
 #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[])
 {
@@ -45,13 +84,16 @@ 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;
+
 	if (argc >= 2) {
 		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);
@@ -59,6 +101,12 @@ main (int argc, char *argv[])
 	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;
@@ -71,14 +119,17 @@ 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;
-	}
-	
+	/* 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.
@@ -86,10 +137,21 @@ main (int argc, char *argv[])
 	 * when we receive the "top_application" D-Bus method.
 	 */
 	if (show_ui_without_top_application_method) {
-		gtk_widget_show_all (GTK_WIDGET(win));
+		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;
+		}
+	
+		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 ();
@@ -97,9 +159,6 @@ main (int argc, char *argv[])
 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;