X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-main.c;h=c7ba04758b5681b347be9fd94d54d8b0656278d9;hb=476fcdad90d5da94ce7d42d821d7bd9b885a2d01;hp=d04b2dc2cd0a2cb535c7dce37608b812d985a88d;hpb=90dc70ac7d7a005eeceb8e62d9c51a06e6c7c974;p=modest diff --git a/src/modest-main.c b/src/modest-main.c index d04b2dc..c7ba047 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -27,76 +27,82 @@ * 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" +#include - -#ifdef MODEST_ENABLE_HILDON /* Hildon includes */ +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if MODEST_PLATFORM_ID==2 /* maemo */ #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 +#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 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, +static int send_mail (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; + TnyPlatformFactory *fact = NULL; + TnyAccountStore *account_store = 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, factory_settings=FALSE; + static gchar *mailto, *subject, *bcc, *cc, *body, *account; 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 specified, default account is 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}, + { "factory-settings", 0, 0, G_OPTION_ARG_NONE, &factory_settings, + N_("return to factory settings"), NULL}, + { NULL, 0, 0, 0, NULL, NULL, NULL } }; - g_type_init (); + 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); + context = g_option_context_new (NULL); g_option_context_add_main_entries (context, options, NULL); @@ -108,53 +114,62 @@ main (int argc, char *argv[]) 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; + + /* 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 (debug) - g_log_set_always_fatal (G_LOG_LEVEL_WARNING); + + if (!getenv("DISPLAY")) + batch = TRUE; if (!batch) { + gdk_threads_init (); 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); + 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); cleanup: - if (modest_conf) - g_object_unref (G_OBJECT(modest_conf)); + if (fact) + g_object_unref (G_OBJECT(fact)); + /* this will clean up account_store as well */ return retval; } static int -start_ui (ModestConf *conf, const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body) +start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, + const gchar* subject, const gchar *body, + TnyAccountStore *account_store) { - ModestUI *modest_ui; + ModestWindow *win; gint retval = 0; - - #ifndef OLD_UI_STUFF - GtkWidget *win; - #endif - modest_ui = MODEST_UI(modest_ui_new (conf)); + 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; } - 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; @@ -170,39 +185,43 @@ 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); + + 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); - modest_icon_factory_uninit (); return retval; } - + static gboolean hildon_init () { -#ifdef MODEST_ENABLE_HILDON - +#if MODEST_PLATFORM_ID==2 + 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"); - + g_printerr ("modest: failed to acquire osso context\n"); return FALSE; - } -#endif /* MODEST_ENABLE_HILDON */ + +#endif /* MODEST_PLATFORM_ID==2 */ return TRUE; } @@ -210,56 +229,60 @@ hildon_init () static int -send_mail (ModestConf *conf, const gchar* mailto, const gchar *cc, const gchar *bcc, +send_mail (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; + TnyPlatformFactory *fact = NULL; + TnyAccountStore *acc_store = NULL; + ModestMailOperation *mail_operation = NULL; - TnyListIface *accounts = NULL; - TnyIteratorIface *iter = NULL; - TnyTransportAccountIface *account = NULL; + TnyList *accounts = NULL; + TnyIterator *iter = NULL; + TnyTransportAccount *account = NULL; int retval; - - 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"); + + 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; } - account = TNY_TRANSPORT_ACCOUNT_IFACE (tny_iterator_iface_current(iter)); + account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current(iter)); - if (!modest_tny_transport_actions_send_message (transport, account, - "<>", mailto, cc, bcc, subject, body, - NULL)) { + mail_operation = modest_mail_operation_new (); + + modest_mail_operation_send_new_mail (mail_operation, + account, "test@example.com", + 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)); + 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 (accounts)); + if (mail_operation) + g_object_unref (G_OBJECT (mail_operation)); + return retval; }