* Added show toolbar application wide code

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 659479d..2021504 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -119,8 +119,8 @@ main (int argc, char *argv[])
        if (!modest_runtime_init ()) {
                g_printerr ("modest: cannot init runtime\n");
                return MODEST_ERR_INIT;
+               
        }
-       
 
        account_or_default = check_account (account);
        g_free (account);
@@ -130,15 +130,20 @@ main (int argc, char *argv[])
                        g_printerr ("modest: cannot start ui\n");
                        retval = MODEST_ERR_UI;
                        goto cleanup;
-               } else
+               } else {
+                       if (modest_conf_get_bool (modest_runtime_get_conf(),
+                                                 MODEST_CONF_CONNECT_AT_STARTUP, NULL))
+                               tny_device_force_online (modest_runtime_get_device());
+                       
                        retval = start_ui (account_or_default,
                                           mailto, cc, bcc, subject, body);
+               }
        } else {
                if (!account_or_default) {
                        g_printerr ("modest: no account has been defined yet\n");
                        retval = MODEST_ERR_CONF;
                        goto cleanup;
-               }
+               }       
                retval = send_mail (account_or_default,
                                    mailto, cc, bcc, subject, body);
        }
@@ -159,25 +164,57 @@ cleanup:
 
 
 static ModestErrorCode 
-start_ui (const gchar *account, const gchar* mailto, const gchar *cc, const gchar *bcc,
+start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const gchar *bcc,
          const gchar* subject, const gchar *body)
 {
        ModestWindow *win = NULL;
 
        if (mailto||cc||bcc||subject||body) {           
                gchar *from;
-               TnyMsg *msg;
-
-               if (!account) {
-                       g_printerr ("modest: no valid account provided, nor is default one available\n");
+               TnyMsg     *msg;
+               TnyFolder  *folder;
+               TnyAccount *account;
+               
+               if (!account_name) {
+                       g_printerr ("modest: no valid account provided, "
+                                   "nor is default one available\n");
                        return MODEST_ERR_PARAM;
                }
-               from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), account);
+               from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
+                                                          account_name);
                msg  = modest_tny_msg_new (mailto,from,cc,bcc,subject,body,NULL);
+               if (!msg) {
+                       g_printerr ("modest: failed to create message\n");
+                       g_free (from);
+                       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);
+               if (!account) {
+                       g_printerr ("modest: failed to get tny account folder\n");
+                       g_free (from);
+                       g_object_unref (G_OBJECT(msg));
+                       return MODEST_ERR_SEND;
+               }
                
-               win = modest_msg_edit_window_new (msg, account);
+               folder = modest_tny_account_get_special_folder (account,
+                                                               TNY_FOLDER_TYPE_DRAFTS);
+               if (!folder) {
+                       g_printerr ("modest: failed to find Drafts folder\n");
+                       g_free (from);
+                       g_object_unref (G_OBJECT(msg));
+                       g_object_unref (G_OBJECT(account));
+                       return MODEST_ERR_SEND;
+               }
+               tny_folder_add_msg (folder, msg, NULL); /* FIXME: check err */
+
+               win = modest_msg_edit_window_new (msg, account_name);
                
                g_object_unref (G_OBJECT(msg));
+               g_object_unref (G_OBJECT(account));
+               g_object_unref (G_OBJECT(folder));
                g_free (from);
        } else 
                win = modest_main_window_new ();
@@ -185,6 +222,9 @@ start_ui (const gchar *account, const gchar* mailto, const gchar *cc, const gcha
        if (!win) {
                g_printerr ("modest: failed to create window\n");
                return MODEST_ERR_UI;
+       } else {
+               ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+               modest_window_mgr_register_window (mgr, win);
        }
        
        gtk_widget_show_all (GTK_WIDGET (win));
@@ -226,6 +266,11 @@ send_mail (const gchar* account_name,
        
        g_return_val_if_fail (account_name, MODEST_ERR_SEND);
 
+       ////////////////////// FIXME ////////
+       modest_runtime_not_implemented (NULL);
+       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));
@@ -240,7 +285,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) {