* Added per-message size limit to send&receive

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 7327119..030ac4f 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -40,6 +40,7 @@
 #include <tny-simple-list.h>
 
 #include <modest-runtime.h>
+#include <modest-platform.h>
 #include <modest-init.h>
 
 #include <modest-defs.h>
@@ -135,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_device_force_online (modest_runtime_get_device());
+                               modest_platform_connect_and_wait(NULL);
                        
                        retval = start_ui (account_or_default,
                                           mailto, cc, bcc, subject, body);
@@ -191,9 +192,8 @@ start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const
                        return MODEST_ERR_SEND;
                }
 
-               account = modest_tny_account_store_get_tny_account_by_account (
-                       modest_runtime_get_account_store(), account_name,
-                       TNY_ACCOUNT_TYPE_TRANSPORT);
+               account = modest_tny_account_store_get_transport_account_for_open_connection (
+                       modest_runtime_get_account_store(), account_name);
                if (!account) {
                        g_printerr ("modest: failed to get tny account folder\n");
                        g_free (from);
@@ -273,9 +273,8 @@ send_mail (const gchar* account_name,
        return MODEST_ERR_NONE;
        //////////////////////////////////////
        
-       account = TNY_TRANSPORT_ACCOUNT (modest_tny_account_store_get_tny_account_by_account
-                                        (modest_runtime_get_account_store(), account_name,
-                                         TNY_ACCOUNT_TYPE_TRANSPORT));
+       account = TNY_TRANSPORT_ACCOUNT (modest_tny_account_store_get_transport_account_for_open_connection
+                                        (modest_runtime_get_account_store(), account_name));
        if (!account) {
                g_printerr ("modest: no transport defined account for %s\n",
                            account_name);
@@ -284,11 +283,12 @@ 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,
                                             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;