2007-06-07 Murray Cumming <murrayc@murrayc.com>

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 9dcc063..5d048dc 100644 (file)
--- 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>
@@ -136,7 +136,7 @@ main (int argc, char *argv[])
                } 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);
+                               modest_platform_connect_and_wait(NULL);
                        
                        retval = start_ui (account_or_default,
                                           mailto, cc, bcc, subject, body);
@@ -283,11 +283,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;