X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=05ebd48e25128cac3c5b5876587d626b89ea0170;hp=988c5c2e0e5638ba60560d3646237f94c7421f26;hb=8636cb7c6267a4668fb1e1d455077cf0c5784316;hpb=4e9a758bcca0bdf5c65cff25f1f5e388292b1afe diff --git a/src/modest-main.c b/src/modest-main.c index 988c5c2..05ebd48 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -27,76 +27,70 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include -#include - -#include -#include - -#include "modest-conf.h" -#include "modest-account-mgr.h" -#include "modest-ui.h" -#include "modest-icon-factory.h" -#include "modest-tny-transport-actions.h" -#include "modest-tny-account-store.h" - - -#ifdef MODEST_ENABLE_HILDON /* Hildon includes */ -#include -#endif /* MODEST_ENABLE_HILDON */ - -/* 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 -#define MODEST_ERR_SEND 6 - -static gboolean hildon_init (); /* NOP if HILDON is not defined */ - -static int start_ui (ModestConf *conf, const gchar* mailto, const gchar *cc, - const gchar *bcc, const gchar* subject, const gchar *body); - -static int send_mail (ModestConf *conf, const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); +#include +#include +#include +#include +#include +#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); int main (int argc, char *argv[]) { - GOptionContext *context = NULL; - ModestConf *modest_conf = NULL; - + GOptionContext *context = NULL; + GError *err = NULL; int retval = MODEST_ERR_NONE; - static gboolean debug=FALSE, batch=FALSE; - 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; + static GOptionEntry options[] = { - { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, - "Run in debug mode" }, { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, - "New email to (comma-separated)"}, + 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)"}, + N_("Cc: addresses for a new mail (comma-separated)"), NULL}, { "bcc", 'x', 0, G_OPTION_ARG_STRING, &bcc, - "Bcc: addresses for a new mail (comma-separated)"}, + 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, - "Run in batch mode (don't show UI)"}, - { NULL } + N_("Run in batch mode (don't show UI)"), NULL}, + { NULL, 0, 0, 0, NULL, NULL, NULL } }; - g_type_init (); - + 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); @@ -104,68 +98,59 @@ 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 (debug) - g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING); - - if (!getenv("DISPLAY")) - batch = TRUE; - if (!batch) { - gtk_init (&argc, &argv); - retval = start_ui (modest_conf, mailto, cc, bcc, subject, body); - } else - retval = send_mail (modest_conf, mailto, cc, bcc, subject, body); - + if (!modest_runtime_init_ui (argc, argv)) { + g_printerr ("modest: cannot start UI\n"); + retval = MODEST_ERR_UI; + goto cleanup; + } else + retval = start_ui (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; + goto cleanup; + } + retval = send_mail (account, mailto, cc, bcc, subject, body); + } cleanup: - if (modest_conf) - g_object_unref (G_OBJECT(modest_conf)); - + 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; } static int -start_ui (ModestConf *conf, const gchar* mailto, const gchar *cc, const gchar *bcc, +start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, const gchar* subject, const gchar *body) { - - ModestUI *modest_ui; - gint retval = 0; - - #ifndef OLD_UI_STUFF - GtkWidget *win; - #endif + ModestWindow *win = NULL; + ModestUI *modest_ui = 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 (!hildon_init ()) { /* NOP if hildon is not defined */ - g_printerr ("modest: failed to initialize hildon, exiting\n"); - retval = MODEST_ERR_HILDON; - goto cleanup; - } + 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 *\/ */ @@ -173,96 +158,78 @@ start_ui (ModestConf *conf, const gchar* mailto, const gchar *cc, const gchar *b /* subject, /\* subject *\/ */ /* body, /\* body *\/ */ /* NULL); /\* attachments *\/ */ - } else -#ifndef OLD_UI_STUFF - win = modest_ui_main_window (modest_ui); - gtk_widget_show (win); -#else - modest_ui_show_main_window (modest_ui); -#endif - gtk_main(); + } else + win = modest_ui_main_window (modest_ui); -cleanup: + if (win) { + gtk_widget_show_all (GTK_WIDGET (win)); + gtk_main(); + } if (modest_ui) - g_object_unref (modest_ui); - - modest_icon_factory_uninit (); + g_object_unref (G_OBJECT(modest_ui)); + return retval; } - -static gboolean -hildon_init () +static gchar* +check_account (const gchar* account) { -#ifdef MODEST_ENABLE_HILDON + gchar *retval; + ModestAccountMgr *account_mgr; - osso_context_t *osso_context = - osso_initialize(PACKAGE, PACKAGE_VERSION, - TRUE, NULL); - if (!osso_context) { - g_printerr ("modest: failed to aquire osso context, exiting\n"); - - return FALSE; - + 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 (!modest_account_mgr_account_exists (account_mgr, account, FALSE, NULL)) { + g_free (retval); + retval = NULL; } -#endif /* MODEST_ENABLE_HILDON */ - - return TRUE; + return retval; } - - static int -send_mail (ModestConf *conf, const gchar* mailto, const gchar *cc, const gchar *bcc, +send_mail (const gchar* account_name, + const gchar* mailto, const gchar *cc, const gchar *bcc, const gchar* subject, const gchar *body) { - ModestAccountMgr *acc_mgr = NULL; - ModestTnyTransportActions *transport = NULL; - ModestTnyAccountStore *acc_store = NULL; - - TnyListIface *accounts = NULL; - TnyIteratorIface *iter = NULL; - TnyTransportAccountIface *account = NULL; int retval; + TnyTransportAccount *account; + ModestMailOperation *mail_operation = NULL; + ModestAccountMgr *account_mgr; + gchar *from_string; - acc_mgr = modest_account_mgr_new (conf); - acc_store = modest_tny_account_store_new (acc_mgr); - transport = modest_tny_transport_actions_new (); - - accounts = TNY_LIST_IFACE(tny_list_new ()); - tny_account_store_iface_get_accounts (TNY_ACCOUNT_STORE_IFACE(acc_store), accounts, - TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS); - - iter = tny_list_iface_create_iterator(accounts); - tny_iterator_iface_first (iter); - if (tny_iterator_iface_is_done (iter)) { - g_printerr("modest: no transport accounts defined\n"); - retval = MODEST_ERR_SEND; - goto cleanup; + g_return_val_if_fail (account_name, MODEST_ERR_SEND); + + account_mgr = modest_runtime_get_account_mgr (); + account = modest_account_mgr_get_tny_account (account_mgr, account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (!account) { + g_printerr ("modest: no transport defined account for %s\n", + account_name); + return MODEST_ERR_SEND; } - - account = TNY_TRANSPORT_ACCOUNT_IFACE (tny_iterator_iface_current(iter)); - - if (!modest_tny_transport_actions_send_message (transport, account, - "<>", mailto, cc, bcc, subject, body, - NULL)) { + from_string = modest_account_mgr_get_from_string (account_mgr, account_name); + + 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; - 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 (transport) - g_object_unref (G_OBJECT(transport)); - if (acc_store) - g_object_unref (G_OBJECT(acc_store)); - if (acc_mgr) - g_object_unref (G_OBJECT(acc_mgr)); + + g_object_unref (G_OBJECT(mail_operation)); + g_free (from_string); return retval; } +