X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=6dd8fa5e579ce1c86255e1a492c4ebd89c5bed18;hp=01cbe3e1f5ed21356c8430bf230495bae8eff9b7;hb=150b4cb3020b18a35b08703f5caa6386025805c7;hpb=d37f9d93ad2b1ff651788fb7eed6abbe4804c13c diff --git a/src/modest-main.c b/src/modest-main.c index 01cbe3e..6dd8fa5 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -27,74 +27,82 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include - -#include "modest-conf.h" -#include "modest-account-mgr.h" -#include "modest-identity-mgr.h" -#include "modest-ui.h" -#include "modest-icon-factory.h" +#include -#ifdef HAVE_CONFIG_H -#include -#endif /*HAVE_CONFIG_H*/ +#include +#include +#include +#include +#include -#ifdef MODEST_ENABLE_HILDON /* Hildon includes */ -#include -#endif /* MODEST_ENABLE_HILDON */ +#include +#include +#include +#include +#include +#include +#include +#include +#include -/* return values */ -#define MODEST_ERR_NONE 0 -#define MODEST_ERR_OPTIONS 1 -#define MODEST_ERR_CONF 2 -#define MODEST_ERR_UI 3 -#define MODEST_ERR_HILDON 4 -#define MODEST_ERR_RUN 5 +#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 gboolean hildon_init (); /* NOP if HILDON is not defined */ +static gchar* check_account (const gchar *account); -static int start_ui (ModestConf *conf, const gchar* mailto, const gchar *cc, - const gchar *bcc, const gchar* subject, const gchar *body); +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[]) { - GOptionContext *context = NULL; - ModestConf *modest_conf = NULL; - ModestUI *modest_ui = NULL; - + GOptionContext *context = NULL; + GError *err = NULL; int retval = MODEST_ERR_NONE; - static gboolean update, debug, batch; - static gchar *mailto, *subject, *bcc, *cc, *body; - + 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[] = { - { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, - "Run in debug mode" }, - { "update", 'u', 0, G_OPTION_ARG_NONE, &update, - "Send/receive active accounts"}, { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, - "Start writing a new email to "}, + N_("New email to (comma-separated)"), NULL}, { "subject", 's', 0, G_OPTION_ARG_STRING, &subject, - "Subject for a new mail"}, + N_("Subject for a new mail"), NULL}, { "body", 'b', 0, G_OPTION_ARG_STRING, &body, - "Body for a new email"}, + N_("Body for a new email"), NULL}, { "cc", 'c', 0, G_OPTION_ARG_STRING, &cc, - "Cc: addresses for a new mail (comma-separated)"}, - { "bcc", 'd', 0, G_OPTION_ARG_STRING, &bcc, - "Bcc: addresses for a new mail (comma-separated)"}, - { "batch", 'b', 0, G_OPTION_ARG_NONE, &batch, - "Run in batch mode (don't show UI)"}, - { NULL } + N_("Cc: addresses for a new mail (comma-separated)"), NULL}, + { "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 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 } }; - g_type_init (); - context = g_option_context_new (NULL); g_option_context_add_main_entries (context, options, NULL); @@ -102,93 +110,181 @@ 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); - - modest_conf = MODEST_CONF(modest_conf_new()); - if (!modest_conf) { - g_printerr ("modest: failed to initialize config system, exiting\n"); - retval = MODEST_ERR_CONF; - goto cleanup; + + if (!modest_runtime_init ()) { + g_printerr ("modest: cannot init runtime\n"); + return MODEST_ERR_INIT; } - gtk_init (&argc, &argv); - retval = start_ui (modest_conf, mailto, cc, bcc, subject, body); -cleanup: - g_object_unref (modest_conf); + 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"); + retval = MODEST_ERR_UI; + goto cleanup; + } else + 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: + g_free (mailto); + g_free (subject); + g_free (bcc); + g_free (cc); + g_free (body); + g_free (account); + + if (!modest_runtime_uninit ()) + g_printerr ("modest: modest_runtime_uninit failed\n"); + return retval; } -int -start_ui (ModestConf *conf, 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) { - ModestUI *modest_ui; - gint ok, retval = 0; + ModestWindow *win = NULL; - modest_ui = MODEST_UI(modest_ui_new (conf)); - if (!modest_ui) { - g_printerr ("modest: failed to initialize ui, exiting\n"); - retval = MODEST_ERR_UI; - goto cleanup; - } - - modest_icon_factory_init (); + 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; + } - if (!hildon_init ()) { /* NOP if hildon is not defined */ - g_printerr ("modest: failed to initialize hildon, exiting\n"); - retval = MODEST_ERR_HILDON; - goto cleanup; - } + 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 */ - if (mailto||cc||bcc||subject||body) { + 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 (); -/* ok = modest_ui_new_edit_window (modest_ui, */ -/* mailto, /\* to *\/ */ -/* cc, /\* cc *\/ */ -/* bcc, /\* bcc *\/ */ -/* subject, /\* subject *\/ */ -/* body, /\* body *\/ */ -/* NULL); /\* attachments *\/ */ - } else - ok = modest_ui_show_main_window (modest_ui); - - if (!ok) { - g_printerr ("modest: showing window failed"); - retval = MODEST_ERR_RUN; - goto cleanup; - } + if (!win) { + g_printerr ("modest: failed to create window\n"); + return MODEST_ERR_UI; + } + gtk_widget_show_all (GTK_WIDGET (win)); gtk_main(); -cleanup: - if (modest_ui) - g_object_unref (modest_ui); + 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); - modest_icon_factory_uninit (); + /* sanity check */ + if (!account || !modest_account_mgr_account_exists (account_mgr, account, FALSE)) { + g_free (retval); + retval = NULL; + } return retval; } - -static gboolean -hildon_init () +static ModestErrorCode +send_mail (const gchar* account_name, + const gchar* mailto, const gchar *cc, const gchar *bcc, + const gchar* subject, const gchar *body) { -#ifdef MODEST_ENABLE_HILDON - - osso_context_t *osso_context = - osso_initialize(PACKAGE, PACKAGE_VERSION, - TRUE, NULL); + int retval; + TnyTransportAccount *account; + ModestMailOperation *mail_operation = NULL; + gchar *from_string; - if (!osso_context) { - g_printerr ("modest: failed to aquire osso context, exiting"); - return FALSE; + g_return_val_if_fail (account_name, MODEST_ERR_SEND); + + 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; } -#endif /* MODEST_ENABLE_HILDON */ + from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), + account_name); - return TRUE; + mail_operation = modest_mail_operation_new (); + modest_mail_operation_send_new_mail (mail_operation, account, + from_string, mailto, + cc, bcc, subject, body, + NULL); + if (modest_mail_operation_get_status (mail_operation) == + MODEST_MAIL_OPERATION_STATUS_FAILED) { + 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); + + return retval; } + +