X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-main.c;h=ca96b75098c0bd9181633b88e4747ae80e477eea;hb=e8034b4378f6fe2e644b149d8fd9fab723cd7a98;hp=7446ef5c9e26e048d9dc990a10515704e2858e3b;hpb=8dd32612f91e282c5f67019dd0bfbd35833fe57b;p=modest diff --git a/src/modest-main.c b/src/modest-main.c index 7446ef5..ca96b75 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -40,18 +40,42 @@ #include #include +#include +#include + #include -#include -#include #include #include #include +#include +#include +#include +#include + +#include +#include + +typedef enum { + MODEST_ERR_NONE = 0, /* no error */ + MODEST_ERR_OPTIONS = 1, /* error in the options */ + MODEST_ERR_CONF = 2, /* error getting confuration db */ + MODEST_ERR_UI = 3, /* error in the UI */ + MODEST_ERR_HILDON = 4, /* error with Hildon (maemo-only) */ + MODEST_ERR_RUN = 5, /* error running */ + MODEST_ERR_SEND = 6, /* error sending mail */ + MODEST_ERR_PARAM = 7, /* error in one or more of the parameters */ + MODEST_ERR_INIT = 8 /* error in initialization */ +} ModestErrorCode; -static int start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); -static int send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); +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); + +static ModestErrorCode send_mail (const gchar* account, + const gchar* mailto, const gchar *cc, const gchar *bcc, + const gchar* subject, const gchar *body); int main (int argc, char *argv[]) { @@ -61,8 +85,9 @@ main (int argc, char *argv[]) int retval = MODEST_ERR_NONE; static gboolean batch = FALSE; - static gchar *mailto, *subject, *bcc, *cc, *body, *account; - + static gchar *mailto=NULL, *subject=NULL, *bcc=NULL, + *cc=NULL, *body=NULL, *account=NULL; + gchar *account_or_default; static GOptionEntry options[] = { { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, N_("New email to (comma-separated)"), NULL}, @@ -75,17 +100,12 @@ main (int argc, char *argv[]) { "bcc", 'x', 0, G_OPTION_ARG_STRING, &bcc, N_("Bcc: addresses for a new mail (comma-separated)"), NULL}, { "account", 'a', 0, G_OPTION_ARG_STRING, &account, - N_("Account to use (if specified, default account is used)"), NULL}, + N_("Account to use (if none specified, the default account will be used)"), NULL}, { "batch", 'y', 0, G_OPTION_ARG_NONE, &batch, N_("Run in batch mode (don't show UI)"), NULL}, { NULL, 0, 0, 0, NULL, NULL, NULL } }; - if (!modest_runtime_init ()) { - g_printerr ("modest: cannot init runtime\n"); - return MODEST_ERR_INIT; - } - context = g_option_context_new (NULL); g_option_context_add_main_entries (context, options, NULL); @@ -93,107 +113,193 @@ main (int argc, char *argv[]) g_printerr ("modest: error in command line parameter(s): '%s', exiting\n", err ? err->message : ""); g_error_free (err); + g_option_context_free (context); retval = MODEST_ERR_OPTIONS; goto cleanup; } g_option_context_free (context); + if (!modest_init_init_core ()) { + g_printerr ("modest: cannot init modest core\n"); + return MODEST_ERR_INIT; + + } + + account_or_default = check_account (account); + g_free (account); + if (!batch) { - if (!modest_runtime_init_ui (argc, argv)) { - g_printerr ("modest: cannot start UI\n"); + if (!modest_init_init_ui (argc, argv)) { + g_printerr ("modest: cannot init modest ui\n"); retval = MODEST_ERR_UI; goto cleanup; - } else - retval = start_ui (mailto, cc, bcc, subject, body); - } else - retval = send_mail (mailto, cc, bcc, subject, body); + } else { + if (modest_conf_get_bool (modest_runtime_get_conf(), + MODEST_CONF_CONNECT_AT_STARTUP, NULL)) + modest_platform_connect_and_wait(NULL); + + 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); + } cleanup: - if (!modest_runtime_uninit ()) - g_printerr ("modest: modest_runtime_uninit failed\n"); + g_free (mailto); + g_free (subject); + g_free (bcc); + g_free (cc); + g_free (body); + g_free (account); + + if (!modest_init_uninit ()) + g_printerr ("modest: modest_init_uninit failed\n"); return retval; } -static int -start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, +static ModestErrorCode +start_ui (const gchar *account_name, const gchar* mailto, const gchar *cc, const gchar *bcc, const gchar* subject, const gchar *body) { ModestWindow *win = NULL; - ModestUI *modest_ui = NULL; - - gint retval = 0; - modest_ui = modest_ui_new (); - - if (mailto||cc||bcc||subject||body) { - g_warning ("FIXME: implement this"); -/* ok = modest_ui_new_edit_window (modest_ui, */ -/* mailto, /\* to *\/ */ -/* cc, /\* cc *\/ */ -/* bcc, /\* bcc *\/ */ -/* subject, /\* subject *\/ */ -/* body, /\* body *\/ */ -/* NULL); /\* attachments *\/ */ + + if (mailto||cc||bcc||subject||body) { + gchar *from; + 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_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_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); + g_object_unref (G_OBJECT(msg)); + return MODEST_ERR_SEND; + } + + 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_ui_main_window (modest_ui); - - if (win) { - gtk_widget_show_all (GTK_WIDGET (win)); - gtk_main(); + win = modest_main_window_new (); + + 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); } - if (modest_ui) - g_object_unref (G_OBJECT(modest_ui)); - return retval; + gtk_widget_show_all (GTK_WIDGET (win)); + gtk_main(); + + return MODEST_ERR_NONE; } +static gchar* +check_account (const gchar* account) +{ + gchar *retval; + ModestAccountMgr *account_mgr; + + account_mgr = modest_runtime_get_account_mgr(); + + if (!account) + retval = modest_account_mgr_get_default_account (account_mgr); + else + retval = g_strdup (account); + /* sanity check */ + if (!account || !modest_account_mgr_account_exists (account_mgr, account, FALSE)) { + g_free (retval); + retval = NULL; + } + return retval; +} -static int -send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, +static ModestErrorCode +send_mail (const gchar* account_name, + const gchar* mailto, const gchar *cc, const gchar *bcc, const gchar* subject, const gchar *body) { - ModestMailOperation *mail_operation = NULL; - TnyList *accounts = NULL; - TnyIterator *iter = NULL; - TnyTransportAccount *account = NULL; int retval; + TnyTransportAccount *account; + ModestMailOperation *mail_operation = NULL; + gchar *from_string; + + g_return_val_if_fail (account_name, MODEST_ERR_SEND); - accounts = TNY_LIST(tny_simple_list_new ()); - tny_account_store_get_accounts (TNY_ACCOUNT_STORE(modest_runtime_get_account_store()), - accounts, - TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); - - iter = tny_list_create_iterator(accounts); - tny_iterator_first (iter); - if (tny_iterator_is_done (iter)) { - g_printerr("modest: no transport accounts defined\n"); - retval = MODEST_ERR_SEND; - goto cleanup; + ////////////////////// FIXME //////// + modest_runtime_not_implemented (NULL); + return MODEST_ERR_NONE; + ////////////////////////////////////// + + 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); + return MODEST_ERR_SEND; } + from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), + account_name); - account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current(iter)); - mail_operation = modest_mail_operation_new (); + mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_SEND, NULL); - modest_mail_operation_send_new_mail (mail_operation, - account, "test@example.com", - mailto, cc, bcc, - subject, body, NULL); - + modest_mail_operation_send_new_mail (mail_operation, account, + from_string, mailto, + 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; - goto cleanup; } else retval = MODEST_ERR_NONE; /* hurray! */ -cleanup: - if (iter) - g_object_unref (G_OBJECT (iter)); - if (accounts) - g_object_unref (G_OBJECT (accounts)); - if (mail_operation) - g_object_unref (G_OBJECT (mail_operation)); + + g_object_unref (G_OBJECT(account)); + g_object_unref (G_OBJECT(mail_operation)); + g_free (from_string); + return retval; } +