X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=05ebd48e25128cac3c5b5876587d626b89ea0170;hp=28bf36195c62259070c67e44bd18235af5565606;hb=8636cb7c6267a4668fb1e1d455077cf0c5784316;hpb=790031656562c2a792dd91efbcb6108eac79b0e1 diff --git a/src/modest-main.c b/src/modest-main.c index 28bf361..05ebd48 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -39,42 +39,35 @@ #include #include +#include #include -#include -#include -#include #include -#include #include #include #include #include -#if MODEST_PLATFORM_ID==2 /* maemo */ -#include -#endif /* MODEST_PLATFORM==2 */ - -static gboolean hildon_init (); /* NOP if HILDON is not defined */ -static int start_ui (const gchar* mailto, const gchar *cc, - const gchar *bcc, const gchar* subject, const gchar *body, - TnyAccountStore *account_store); - -static int send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); - +#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; - TnyPlatformFactory *fact = NULL; - TnyAccountStore *account_store = NULL; + GOptionContext *context = NULL; GError *err = NULL; int retval = MODEST_ERR_NONE; - static gboolean batch=FALSE, factory_settings=FALSE; - static gchar *mailto, *subject, *bcc, *cc, *body, *account; - + static gboolean batch = FALSE; + static gchar *mailto=NULL, *subject=NULL, *bcc=NULL, + *cc=NULL, *body=NULL, *account=NULL; + static GOptionEntry options[] = { { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, N_("New email to (comma-separated)"), NULL}, @@ -87,23 +80,16 @@ 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}, - { "factory-settings", 0, 0, G_OPTION_ARG_NONE, &factory_settings, - N_("return to factory settings"), NULL}, { NULL, 0, 0, 0, NULL, NULL, NULL } }; - bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - modest_debug_g_type_init (); - modest_debug_logging_init (); - - g_thread_init (NULL); - gdk_threads_init (); /* hmmm... not really needed if we're not doing */ + 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); @@ -112,74 +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); - - /* Get platform factory */ - fact = modest_tny_platform_factory_get_instance (); - - if (!modest_init_local_folders ()) { - g_printerr ("modest: failed to initialize local folders, exiting\n"); - retval = MODEST_ERR_INIT; - goto cleanup; - } - - /* Get the account store */ - account_store = tny_platform_factory_new_account_store (fact); - if (!account_store) { - g_printerr ("modest: could not initialize a ModestTnyAccountStore instance\n"); - retval = MODEST_ERR_RUN; - goto cleanup; - } - - if (!getenv("DISPLAY")) - batch = TRUE; if (!batch) { - if (!gtk_init_check(&argc, &argv)) { - g_printerr ("modest: failed to start graphical ui\n"); + if (!modest_runtime_init_ui (argc, argv)) { + g_printerr ("modest: cannot start UI\n"); + retval = MODEST_ERR_UI; goto cleanup; - } - modest_init_header_columns (factory_settings); - retval = start_ui (mailto, cc, bcc, subject, body, account_store); - - } else - retval = send_mail (mailto, cc, bcc, subject, body); + } 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 (fact) - g_object_unref (G_OBJECT(fact)); + 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"); - /* this will clean up account_store as well */ return retval; } static int start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body, - TnyAccountStore *account_store) + const gchar* subject, const gchar *body) { - ModestUI *modest_ui; ModestWindow *win = NULL; - gint retval = 0; - - modest_ui = MODEST_UI(modest_ui_new (account_store)); - if (!modest_ui) { - g_printerr ("modest: failed to initialize ui, exiting\n"); - retval = MODEST_ERR_UI; - goto cleanup; - } + ModestUI *modest_ui = NULL; - 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 *\/ */ @@ -191,98 +162,74 @@ start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, win = modest_ui_main_window (modest_ui); if (win) { - TnyDevice *device; - gtk_widget_show_all (GTK_WIDGET (win)); - - /* Go online */ - device = tny_account_store_get_device (account_store); - tny_device_force_online (device); - g_object_unref (G_OBJECT (device)); - gtk_main(); } -cleanup: if (modest_ui) - g_object_unref (modest_ui); - + g_object_unref (G_OBJECT(modest_ui)); + return retval; } - -static gboolean -hildon_init () +static gchar* +check_account (const gchar* account) { -#if MODEST_PLATFORM_ID==2 + gchar *retval; + ModestAccountMgr *account_mgr; + + account_mgr = modest_runtime_get_account_mgr(); - osso_context_t *osso_context = - osso_initialize(PACKAGE, PACKAGE_VERSION, - TRUE, NULL); - if (!osso_context) { - g_printerr ("modest: failed to acquire osso context\n"); - return FALSE; + 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_PLATFORM_ID==2 */ - return TRUE; + return retval; } - - static int -send_mail (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; - TnyPlatformFactory *fact = NULL; - TnyAccountStore *acc_store = NULL; - ModestMailOperation *mail_operation = NULL; - - TnyList *accounts = NULL; - TnyIterator *iter = NULL; - TnyTransportAccount *account = NULL; int retval; - - fact = modest_tny_platform_factory_get_instance (); - acc_mgr = modest_tny_platform_factory_get_account_mgr_instance - (MODEST_TNY_PLATFORM_FACTORY(fact)); - acc_store = tny_platform_factory_new_account_store (fact); - - accounts = TNY_LIST(tny_simple_list_new ()); - tny_account_store_get_accounts (TNY_ACCOUNT_STORE(acc_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; + 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 = 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 (tny_iterator_get_current(iter)); + 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, "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); 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(mail_operation)); + g_free (from_string); + return retval; } +