Committing so that svn lets me rename

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 46d49af..dc211c7 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -124,7 +124,10 @@ main (int argc, char *argv[])
 
        account_or_default = check_account (account);
        g_free (account);
-       
+
+/*     if (modest_conf_get_bool (modest_runtime_get_conf(), MODEST_CONF_CONNECT_AT_STARTUP, NULL))
+               tny_device_force_online (modest_runtime_get_device());
+*/                     
        if (!batch) {
                if (!modest_runtime_init_ui (argc, argv)) {
                        g_printerr ("modest: cannot start ui\n");
@@ -219,7 +222,7 @@ start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const
                return MODEST_ERR_UI;
        }
        
-       gtk_widget_show_all (GTK_WIDGET (win));
+       gtk_widget_show (GTK_WIDGET (win));
        gtk_main();
        
        return MODEST_ERR_NONE;
@@ -277,7 +280,7 @@ send_mail (const gchar* account_name,
        mail_operation = modest_mail_operation_new ();
        modest_mail_operation_send_new_mail (mail_operation, account,
                                             from_string, mailto,
-                                            cc, bcc, subject, body,
+                                            cc, bcc, subject, body, NULL,
                                             NULL);
        if (modest_mail_operation_get_status (mail_operation) == 
            MODEST_MAIL_OPERATION_STATUS_FAILED) {