* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <config.h>
#include <glib.h>
#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#include "modest-conf.h"
-#include "modest-account-mgr.h"
-#include "modest-identity-mgr.h"
-#include "modest-ui.h"
-#include "modest-icon-factory.h"
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-
-#ifdef MODEST_ENABLE_HILDON /* Hildon includes */
-#include <libosso.h>
-#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
-
-
-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);
-
+#include <gtk/gtkwidget.h>
+
+#include <tny-list.h>
+#include <tny-transport-account.h>
+#include <tny-account-store.h>
+#include <tny-list.h>
+#include <tny-simple-list.h>
+
+#include <modest-runtime.h>
+#include <modest-defs.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>
+
+#include <modest-account-mgr.h>
+#include <modest-account-mgr-helpers.h>
+
+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;
- ModestUI *modest_ui = NULL;
-
+ GOptionContext *context = NULL;
+
GError *err = NULL;
int retval = MODEST_ERR_NONE;
- static gboolean update, debug, batch;
- 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" },
- { "update", 'u', 0, G_OPTION_ARG_NONE, &update,
- "Send/receive active accounts"},
{ "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto,
- "Start writing a new email to <addresses>"},
+ N_("New email to <addresses> (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)"},
- { "bcc", 'd', 0, G_OPTION_ARG_STRING, &bcc,
- "Bcc: addresses for a new mail (comma-separated)"},
- { "batch", 'b', 0, G_OPTION_ARG_NONE, &batch,
- "Run in batch mode (don't show UI)"},
- { NULL }
+ N_("Cc: addresses for a new mail (comma-separated)"), NULL},
+ { "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 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},
+ { 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);
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 (!batch) {
+ 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);
}
- gtk_init (&argc, &argv);
- retval = start_ui (modest_conf, mailto, cc, bcc, subject, body);
-
cleanup:
- g_object_unref (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;
}
-int
-start_ui (ModestConf *conf, const gchar* mailto, const gchar *cc, const gchar *bcc,
+static int
+start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc,
const gchar* subject, const gchar *body)
{
- ModestUI *modest_ui;
- gint ok, retval = 0;
-
- 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;
- }
+ ModestWindow *win = NULL;
+ ModestUI *modest_ui = NULL;
- 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 *\/ */
/* subject, /\* subject *\/ */
/* body, /\* body *\/ */
/* NULL); /\* attachments *\/ */
- } else
- ok = modest_ui_show_main_window (modest_ui);
+ } else
+ win = modest_ui_main_window (modest_ui);
- if (!ok) {
- g_printerr ("modest: showing window failed");
- retval = MODEST_ERR_RUN;
- goto cleanup;
- }
-
- gtk_main();
-
-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);
+ account_mgr = modest_runtime_get_account_mgr();
- if (!osso_context) {
- g_printerr ("modest: failed to aquire osso context, exiting");
- 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_ENABLE_HILDON */
+ return retval;
+}
- return TRUE;
+static int
+send_mail (const gchar* account_name,
+ const gchar* mailto, const gchar *cc, const gchar *bcc,
+ const gchar* subject, const gchar *body)
+{
+ int retval;
+ 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;
+ }
+ 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;
+ } else
+ retval = MODEST_ERR_NONE; /* hurray! */
+
+ g_object_unref (G_OBJECT(mail_operation));
+ g_free (from_string);
+
+ return retval;
}
+
+
projects / modest / blobdiff