* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <config.h>
#include <glib.h>
#include <glib/gi18n.h>
#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 <config.h>
+#include <modest-defs.h>
+#include <modest-init.h>
#include <modest-conf.h>
#include <modest-account-mgr.h>
#include <modest-ui.h>
#include <libosso.h>
#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,
GOptionContext *context = NULL;
TnyPlatformFactory *fact = NULL;
TnyAccountStore *account_store = NULL;
- ModestConf *modest_conf = NULL;
GError *err = NULL;
int retval = MODEST_ERR_NONE;
- static gboolean 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[] = {
{ "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto,
- "New email to <addresses> (comma-separated)", NULL},
+ N_("New email to <addresses> (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 }
};
modest_debug_logging_init ();
g_thread_init (NULL);
+ gdk_threads_init (); /* hmmm... not really needed if we're not doing */
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, options, NULL);
/* 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) {
batch = TRUE;
if (!batch) {
- gdk_threads_init ();
- gtk_init (&argc, &argv);
+ if (!gtk_init_check(&argc, &argv)) {
+ g_printerr ("modest: failed to start graphical ui\n");
+ 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);
-
cleanup:
- g_object_unref (G_OBJECT(fact));
+ if (fact)
+ g_object_unref (G_OBJECT(fact));
+
/* this will clean up account_store as well */
-
return retval;
}
TnyAccountStore *account_store)
{
ModestUI *modest_ui;
- ModestWindow *win;
+ ModestWindow *win = NULL;
gint retval = 0;
modest_ui = MODEST_UI(modest_ui_new (account_store));
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;
}
if (mailto||cc||bcc||subject||body) {
-
/* ok = modest_ui_new_edit_window (modest_ui, */
/* mailto, /\* to *\/ */
/* cc, /\* cc *\/ */
if (win) {
TnyDevice *device;
- gtk_widget_show (GTK_WIDGET (win));
+ gtk_widget_show_all (GTK_WIDGET (win));
/* Go online */
device = tny_account_store_get_device (account_store);
if (modest_ui)
g_object_unref (modest_ui);
- modest_icon_factory_uninit ();
return retval;
}
g_printerr ("modest: failed to acquire osso context\n");
return FALSE;
}
-
#endif /* MODEST_PLATFORM_ID==2 */
-
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;
- ModestMailOperation *mail_operation;
+ ModestMailOperation *mail_operation = NULL;
TnyList *accounts = NULL;
TnyIterator *iter = NULL;
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 ());
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;
projects / modest / blobdiff