X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=988c5c2e0e5638ba60560d3646237f94c7421f26;hp=d04b2dc2cd0a2cb535c7dce37608b812d985a88d;hb=4e9a758bcca0bdf5c65cff25f1f5e388292b1afe;hpb=90dc70ac7d7a005eeceb8e62d9c51a06e6c7c974

diff --git a/src/modest-main.c b/src/modest-main.c
index d04b2dc..988c5c2 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -117,7 +117,10 @@ main (int argc, char *argv[])
 	}
 
 	if (debug)
-		g_log_set_always_fatal (G_LOG_LEVEL_WARNING);
+		g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING);
+	
+	if (!getenv("DISPLAY"))
+		batch = TRUE; 
 	
 	if (!batch) {
 		gtk_init (&argc, &argv);
@@ -233,7 +236,7 @@ send_mail (ModestConf *conf, const gchar* mailto, const gchar *cc, const gchar *
 	iter = tny_list_iface_create_iterator(accounts);
 	tny_iterator_iface_first (iter);
 	if (tny_iterator_iface_is_done (iter)) {
-		g_printerr("modest: no transport accounts defined");
+		g_printerr("modest: no transport accounts defined\n");
 		retval = MODEST_ERR_SEND;
 		goto cleanup;
 	}