X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-main.c;h=edf74b381fb154a5ada1ca5cced654ccc1c9a2f3;hp=a013ba91d5e48d3cd2d70d833141026defa2b2db;hb=1f6375ad6e5dd08dac82311056e01bfe434bac9b;hpb=4a2c0a363e35c5d1c673aa34ea1fddb28ddde1e5 diff --git a/src/modest-main.c b/src/modest-main.c index a013ba9..edf74b3 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -27,237 +27,64 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include -#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-account-store.h" -#include "modest-tny-platform-factory.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 (const gchar* mailto, const gchar *cc, - const gchar *bcc, const gchar* subject, const gchar *body); - -static int send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, - const gchar* subject, const gchar *body); +#include +#include +#include +#include int main (int argc, char *argv[]) { - GOptionContext *context = NULL; - TnyPlatformFactory *fact = NULL; - ModestConf *modest_conf = NULL; - - GError *err = NULL; - int retval = MODEST_ERR_NONE; + ModestWindow *win; + int retval = 0; - static gboolean debug=FALSE, batch=FALSE; - static gchar *mailto, *subject, *bcc, *cc, *body; - - static GOptionEntry options[] = { - { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug, - "Run in debug mode", NULL}, - { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, - "New email to (comma-separated)", NULL}, - { "subject", 's', 0, G_OPTION_ARG_STRING, &subject, - "Subject for a new mail", NULL}, - { "body", 'b', 0, G_OPTION_ARG_STRING, &body, - "Body for a new email", NULL}, - { "cc", 'c', 0, G_OPTION_ARG_STRING, &cc, - "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)", NULL}, - { "batch", 'y', 0, G_OPTION_ARG_NONE, &batch, - "Run in batch mode (don't show UI)", NULL}, - { NULL, 0, 0, 0, NULL, NULL, NULL } - }; + if (!g_thread_supported()) + g_thread_init (NULL); - g_type_init (); + gdk_threads_init (); + gdk_threads_enter (); - context = g_option_context_new (NULL); - g_option_context_add_main_entries (context, options, NULL); - - if (!g_option_context_parse (context, &argc, &argv, &err)) { - g_printerr ("modest: error in command line parameter(s): '%s', exiting\n", - err ? err->message : ""); - g_error_free (err); - retval = MODEST_ERR_OPTIONS; + if (!gtk_init_check(&argc, &argv)) { + g_printerr ("modest: failed to initialize gtk\n"); + retval = 1; goto cleanup; } - g_option_context_free (context); - - fact = modest_tny_platform_factory_get_instance (); - modest_conf = modest_tny_platform_factory_get_modest_conf_instance (fact); - if (!modest_conf) { - g_printerr ("modest: failed to initialize config system, exiting\n"); - retval = MODEST_ERR_CONF; + + if (!modest_init (argc, argv)) { + g_printerr ("modest: cannot init modest\n"); + retval = 1; 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 (mailto, cc, bcc, subject, body); - } else - retval = send_mail (mailto, cc, bcc, subject, body); + win = modest_main_window_new (); + gtk_widget_show_all (GTK_WIDGET(win)); - -cleanup: - - return retval; -} - - -static int -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 - - modest_ui = MODEST_UI(modest_ui_new ()); - if (!modest_ui) { - g_printerr ("modest: failed to initialize ui, exiting\n"); - retval = MODEST_ERR_UI; + if (!win) { + g_printerr ("modest: failed to create main window\n"); + retval = 1; 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; - } - - if (mailto||cc||bcc||subject||body) { - -/* ok = modest_ui_new_edit_window (modest_ui, */ -/* mailto, /\* to *\/ */ -/* cc, /\* cc *\/ */ -/* bcc, /\* bcc *\/ */ -/* 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(); + modest_window_mgr_register_window (modest_runtime_get_window_mgr(), + win); + g_object_unref (win); -cleanup: - if (modest_ui) - g_object_unref (modest_ui); - - modest_icon_factory_uninit (); - return retval; -} - + gtk_main (); + retval = 0; -static gboolean -hildon_init () -{ -#ifdef MODEST_ENABLE_HILDON - - 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; - - } -#endif /* MODEST_ENABLE_HILDON */ - - return TRUE; -} - - - -static int -send_mail (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; - - 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_modest_account_mgr_instance (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); +cleanup: + gdk_threads_leave (); - 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; + if (!modest_init_uninit ()) { + g_printerr ("modest: modest_init_uninit failed\n"); + retval = 1; } - account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current(iter)); - - if (!modest_mail_operation_send_mail (account, - "djcb@djcbsoftware.nl", mailto, cc, bcc, subject, body, - NULL)) { - retval = MODEST_ERR_SEND; - goto cleanup; - } else - retval = MODEST_ERR_NONE; /* hurray! */ + g_debug ("closing modest with retval %d", retval); -cleanup: - if (iter) - g_object_unref (G_OBJECT(iter)); - if (accounts) - g_object_unref (G_OBJECT(accounts)); - return retval; }