X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-main.c;h=e0dc501674a0cff6bbb14f651ad559ce33122eaf;hb=558219dfdd5d2effce04afd18988b35b14dddf06;hp=9dcc06344297de697f9367507fe6c6e3d1aaef03;hpb=95450fa69acf453d0ffdeabae6d6a67aeabac235;p=modest

diff --git a/src/modest-main.c b/src/modest-main.c
index 9dcc063..e0dc501 100644
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -38,9 +38,9 @@
 #include <tny-account-store.h>
 #include <tny-list.h>
 #include <tny-simple-list.h>
-#include <tny-maemo-conic-device.h> /* For tny_maemo_conic_device_connect() */
 
 #include <modest-runtime.h>
+#include <modest-platform.h>
 #include <modest-init.h>
 
 #include <modest-defs.h>
@@ -71,11 +71,20 @@ static gchar*           check_account (const gchar *account);
 
 static ModestErrorCode  start_ui      (const gchar *account,
 				       const gchar* mailto, const gchar *cc,
-				       const gchar *bcc, const gchar* subject, const gchar *body);
+				       const gchar *bcc, const gchar* subject, const gchar *body, GtkWidget **ui);
 
 static ModestErrorCode  send_mail     (const gchar* account,
 				       const gchar* mailto, const gchar *cc, const gchar *bcc,
 				       const gchar* subject, const gchar *body);
+
+static void 
+on_show (GtkWidget *widget, gpointer user_data)
+{
+	if (modest_conf_get_bool (modest_runtime_get_conf(),
+		MODEST_CONF_CONNECT_AT_STARTUP, NULL))
+	modest_platform_connect_and_wait(NULL);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -106,6 +115,11 @@ main (int argc, char *argv[])
 		{ NULL, 0, 0, 0, NULL, NULL, NULL }
 	};
 
+	/* Enable threads before anything else, to prevent memory corruption */
+	if (!g_thread_supported())
+		g_thread_init(NULL);
+	gdk_threads_init ();
+
 	context = g_option_context_new (NULL);
 	g_option_context_add_main_entries (context, options, NULL);
 	
@@ -134,12 +148,11 @@ main (int argc, char *argv[])
 			retval = MODEST_ERR_UI;
 			goto cleanup;
 		} else {
-			if (modest_conf_get_bool (modest_runtime_get_conf(),
-						  MODEST_CONF_CONNECT_AT_STARTUP, NULL))
-				tny_maemo_conic_device_connect (TNY_MAEMO_CONIC_DEVICE (modest_runtime_get_device()), NULL);
-			
+			GtkWidget *ui = NULL;
 			retval = start_ui (account_or_default,
-					   mailto, cc, bcc, subject, body);
+					   mailto, cc, bcc, subject, body, &ui);
+			if (ui)	
+				g_signal_connect (G_OBJECT (ui), "show", G_CALLBACK(on_show), NULL);
 		}
 	} else {
 		if (!account_or_default) {
@@ -168,7 +181,7 @@ cleanup:
 
 static ModestErrorCode 
 start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const gchar *bcc,
-	  const gchar* subject, const gchar *body)
+	  const gchar* subject, const gchar *body, GtkWidget **ui)
 {
 	ModestWindow *win = NULL;
 
@@ -227,6 +240,8 @@ start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const
 	} else {
 		ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
 		modest_window_mgr_register_window (mgr, win);
+		*ui = (GtkWidget*) win;
+		g_object_unref (win);
 	}
 	
 	gtk_widget_show_all (GTK_WIDGET (win));
@@ -283,11 +298,13 @@ send_mail (const gchar* account_name,
 	from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
 							  account_name);
 
-	mail_operation = modest_mail_operation_new ();
+	mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_SEND, NULL);
+
 	modest_mail_operation_send_new_mail (mail_operation, account,
+					     NULL,
 					     from_string, mailto,
-					     cc, bcc, subject, body, NULL,
-					     NULL, 0);
+					     cc, bcc, subject, body, NULL /* html_body */,
+					     NULL /* attachments */, 0 /* priority */);
 	if (modest_mail_operation_get_status (mail_operation) == 
 	    MODEST_MAIL_OPERATION_STATUS_FAILED) {
 		retval = MODEST_ERR_SEND;