X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=6dd8fa5e579ce1c86255e1a492c4ebd89c5bed18;hp=bb9d8569bdaee89c8ed5c6171d18bacffb03f43d;hb=150b4cb3020b18a35b08703f5caa6386025805c7;hpb=9e923ff0a56e5aed1bb92a9144049250cb231527 diff --git a/src/modest-main.c b/src/modest-main.c index bb9d856..6dd8fa5 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -41,20 +41,38 @@ #include #include -#include #include #include #include - +#include +#include #include #include -static gchar* check_account (const gchar *account); -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* account, - const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); +#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 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[]) { @@ -66,7 +84,7 @@ main (int argc, char *argv[]) static gboolean batch = FALSE; 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}, @@ -85,11 +103,6 @@ main (int argc, char *argv[]) { 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); @@ -103,24 +116,31 @@ main (int argc, char *argv[]) } g_option_context_free (context); + if (!modest_runtime_init ()) { + g_printerr ("modest: cannot init runtime\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"); + g_printerr ("modest: cannot start ui\n"); retval = MODEST_ERR_UI; goto cleanup; } else - retval = start_ui (mailto, cc, bcc, subject, body); + retval = start_ui (account_or_default, + mailto, cc, bcc, subject, body); } else { - gchar *account_or_default; - account_or_default = check_account (account); - g_free (account); - if (!account_or_default) { - g_printerr ("modest: account is not valid\n"); - retval = MODEST_ERR_PARAM; + g_printerr ("modest: no account has been defined yet\n"); + retval = MODEST_ERR_CONF; goto cleanup; - } - retval = send_mail (account, mailto, cc, bcc, subject, body); + } + retval = send_mail (account_or_default, + mailto, cc, bcc, subject, body); } cleanup: @@ -138,36 +158,71 @@ cleanup: } -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_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; + } + + 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; } - 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* @@ -175,7 +230,7 @@ check_account (const gchar* account) { gchar *retval; ModestAccountMgr *account_mgr; - + account_mgr = modest_runtime_get_account_mgr(); if (!account) @@ -184,14 +239,14 @@ check_account (const gchar* account) retval = g_strdup (account); /* sanity check */ - if (!modest_account_mgr_account_exists (account_mgr, account, FALSE, NULL)) { + if (!account || !modest_account_mgr_account_exists (account_mgr, account, FALSE)) { g_free (retval); retval = NULL; } return retval; } -static int +static ModestErrorCode send_mail (const gchar* account_name, const gchar* mailto, const gchar *cc, const gchar *bcc, const gchar* subject, const gchar *body) @@ -199,20 +254,20 @@ send_mail (const gchar* account_name, int retval; TnyTransportAccount *account; ModestMailOperation *mail_operation = NULL; - ModestAccountMgr *account_mgr; gchar *from_string; g_return_val_if_fail (account_name, MODEST_ERR_SEND); - account_mgr = modest_runtime_get_account_mgr (); - account = TNY_TRANSPORT_ACCOUNT(modest_account_mgr_get_tny_account (account_mgr, account_name, - TNY_ACCOUNT_TYPE_TRANSPORT)); + account = TNY_TRANSPORT_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: no transport defined account for %s\n", account_name); return MODEST_ERR_SEND; } - from_string = modest_account_mgr_get_from_string (account_mgr, account_name); + from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), + account_name); mail_operation = modest_mail_operation_new (); modest_mail_operation_send_new_mail (mail_operation, account, @@ -224,7 +279,8 @@ send_mail (const gchar* account_name, retval = MODEST_ERR_SEND; } else retval = MODEST_ERR_NONE; /* hurray! */ - + + g_object_unref (G_OBJECT(account)); g_object_unref (G_OBJECT(mail_operation)); g_free (from_string);