X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-main.c;h=c7ba04758b5681b347be9fd94d54d8b0656278d9;hb=476fcdad90d5da94ce7d42d821d7bd9b885a2d01;hp=3b59c3971d7b3b76bf3038fa802ebe82c6b7a222;hpb=b22ec780fbe4629d4200f40b8fdced00f50990f8;p=modest diff --git a/src/modest-main.c b/src/modest-main.c index 3b59c39..c7ba047 100644 --- a/src/modest-main.c +++ b/src/modest-main.c @@ -27,41 +27,33 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include -#include +#include + #include #include #include #include #include -#include "config.h" -#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" -#include "modest-mail-operation.h" - - -#if MODEST_PLATFORM_ID==2 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if MODEST_PLATFORM_ID==2 /* maemo */ #include #endif /* MODEST_PLATFORM==2 */ -/* 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, TnyAccountStore *account_store); @@ -75,29 +67,30 @@ main (int argc, char *argv[]) GOptionContext *context = NULL; TnyPlatformFactory *fact = NULL; TnyAccountStore *account_store = NULL; - ModestConf *modest_conf = 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", NULL}, { "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto, - "New email to (comma-separated)", NULL}, + N_("New email to (comma-separated)"), NULL}, { "subject", 's', 0, G_OPTION_ARG_STRING, &subject, - "Subject for a new mail", NULL}, + N_("Subject for a new mail"), NULL}, { "body", 'b', 0, G_OPTION_ARG_STRING, &body, - "Body for a new email", NULL}, + N_("Body for a new email"), NULL}, { "cc", 'c', 0, G_OPTION_ARG_STRING, &cc, - "Cc: addresses for a new mail (comma-separated)", NULL}, + 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)", NULL}, + 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 } }; @@ -105,10 +98,11 @@ main (int argc, char *argv[]) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - g_type_init (); - g_thread_init (NULL); - gdk_threads_init (); + 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); @@ -124,14 +118,12 @@ main (int argc, char *argv[]) /* Get platform factory */ fact = modest_tny_platform_factory_get_instance (); - /* Check modest conf */ - 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_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) { @@ -140,20 +132,23 @@ main (int argc, char *argv[]) goto cleanup; } - if (debug) - g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING); if (!getenv("DISPLAY")) batch = TRUE; if (!batch) { + gdk_threads_init (); gtk_init (&argc, &argv); + 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 (fact) + g_object_unref (G_OBJECT(fact)); + /* this will clean up account_store as well */ return retval; } @@ -164,13 +159,9 @@ 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 (account_store)); if (!modest_ui) { @@ -179,8 +170,6 @@ start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, 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; @@ -202,7 +191,7 @@ start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc, if (win) { TnyDevice *device; - gtk_widget_show (win); + gtk_widget_show_all (GTK_WIDGET (win)); /* Go online */ device = tny_account_store_get_device (account_store); @@ -215,10 +204,9 @@ cleanup: if (modest_ui) g_object_unref (modest_ui); - modest_icon_factory_uninit (); return retval; } - + static gboolean hildon_init () @@ -247,7 +235,7 @@ send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, ModestAccountMgr *acc_mgr = NULL; TnyPlatformFactory *fact = NULL; TnyAccountStore *acc_store = NULL; - ModestMailOperation *mail_operation; + ModestMailOperation *mail_operation = NULL; TnyList *accounts = NULL; TnyIterator *iter = NULL; @@ -255,7 +243,8 @@ send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, int retval; fact = modest_tny_platform_factory_get_instance (); - acc_mgr = modest_tny_platform_factory_get_modest_account_mgr_instance (fact); + 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 ()); @@ -275,11 +264,10 @@ send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, mail_operation = modest_mail_operation_new (); modest_mail_operation_send_new_mail (mail_operation, - account, - "djcb@djcbsoftware.nl", mailto, cc, bcc, + 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; @@ -288,9 +276,12 @@ send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc, 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)); + 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)); return retval; }