#include <config.h>
#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkwidget.h>
+#include <modest-runtime.h>
+#include <modest-init.h>
+#include "modest-platform.h"
+#include <gdk/gdk.h>
+#include <widgets/modest-main-window.h>
+#include <string.h>
+
+ static gboolean
+on_idle_exit_modest (gpointer data)
+{
+ /* Protect the Gtk calls */
+ gdk_threads_enter ();
-#include <tny-list.h>
-#include <tny-transport-account.h>
-#include <tny-account-store.h>
-#include <tny-list.h>
-#include <tny-simple-list.h>
+ /* Wait for remaining tasks */
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
-#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>
+ gtk_main_quit ();
+
+ gdk_threads_leave ();
+
+ return FALSE;
+}
+static void
+on_queue_empty (ModestMailOperationQueue *queue,
+ gpointer user_data)
+{
+ ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
+ /* Exit if the queue is empty and there are no more windows */
+ if (modest_window_mgr_num_windows (mgr) == 0)
+ g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, NULL, NULL);
+}
-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);
+static void
+on_window_list_empty (ModestWindowMgr *window_mgr,
+ gpointer user_data)
+{
+ ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue ();
+
+ /* Exit if there are no more windows and the queue is empty */
+ if (modest_mail_operation_queue_num_elements (queue) == 0)
+ g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, NULL, NULL);
+}
int
main (int argc, char *argv[])
{
- GOptionContext *context = NULL;
-
- GError *err = NULL;
- int retval = MODEST_ERR_NONE;
+ /* Usually we don't show the application at first,
+ * because we wait for the top_application D-Bus method to
+ * be called. But that's annoying when starting from the
+ * command line.: */
+ gboolean show_ui_without_top_application_method = FALSE;
+ int retval = 0;
+
+ if (argc >= 2) {
+ if (strcmp (argv[1], "showui") == 0)
+ show_ui_without_top_application_method = TRUE;
+ }
+
+ if (!show_ui_without_top_application_method) {
+ g_print ("modest: use 'modest showui' to start from cmdline with UI\n");
+ }
- 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,
- N_("New email to <addresses> (comma-separated)"), NULL},
- { "subject", 's', 0, G_OPTION_ARG_STRING, &subject,
- N_("Subject for a new mail"), NULL},
- { "body", 'b', 0, G_OPTION_ARG_STRING, &body,
- N_("Body for a new email"), NULL},
- { "cc", 'c', 0, G_OPTION_ARG_STRING, &cc,
- 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 specified, default account is used)"), NULL},
- { "batch", 'y', 0, G_OPTION_ARG_NONE, &batch,
- 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 }
- };
-
- if (!modest_runtime_init ()) {
- g_printerr ("modest: cannot init runtime\n");
- return MODEST_ERR_INIT;
+ if (!g_thread_supported())
+ g_thread_init (NULL);
+
+ gdk_threads_init ();
+ gdk_threads_enter ();
+
+ if (!getenv("DISPLAY")) {
+ g_printerr ("modest: DISPLAY env variable is not set\n");
+ retval = 1;
+ goto cleanup;
}
- 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);
-
- if (!getenv("DISPLAY"))
- batch = TRUE;
-
- if (!batch) {
- if (!gtk_init_check(&argc, &argv)) {
- g_printerr ("modest: failed to start graphical ui\n");
+
+ if (!modest_init (argc, argv)) {
+ g_printerr ("modest: cannot init modest\n");
+ retval = 1;
+ goto cleanup;
+ }
+
+ /* Connect to the queue-emtpy signal */
+ g_signal_connect (modest_runtime_get_mail_operation_queue (),
+ "queue-empty",
+ G_CALLBACK (on_queue_empty),
+ NULL);
+
+ g_signal_connect (modest_runtime_get_window_mgr (),
+ "window-list-empty",
+ G_CALLBACK (on_window_list_empty),
+ NULL);
+
+ /* Usually, we only show the UI when we get the "top_application" D-Bus method.
+ * This allows modest to start via D-Bus activation to provide a service,
+ * without showing the UI.
+ * The UI will be shown later (or just after starting if no otehr D-Bus method was used),
+ * when we receive the "top_application" D-Bus method.
+ */
+ if (show_ui_without_top_application_method) {
+ ModestWindow *main_win;
+
+ /* this will create & register the window */
+ main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
+ TRUE);
+ if (!main_win) {
+ g_printerr ("modest: failed to get main window instance\n");
+ retval = 1;
goto cleanup;
}
- retval = start_ui (mailto, cc, bcc, subject, body);
-
- } else
- retval = send_mail (mailto, cc, bcc, subject, body);
-cleanup:
- if (!modest_runtime_uninit ())
- g_printerr ("modest: modest_runtime_uninit failed\n");
+ gtk_widget_show_all (GTK_WIDGET(main_win));
- return retval;
-}
-
-
-static int
-start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc,
- const gchar* subject, const gchar *body)
-{
- ModestWindow *win = NULL;
- ModestUI *modest_ui = NULL;
-
- 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 *\/ */
-/* bcc, /\* bcc *\/ */
-/* subject, /\* subject *\/ */
-/* body, /\* body *\/ */
-/* NULL); /\* attachments *\/ */
- } else
- win = modest_ui_main_window (modest_ui);
-
- if (win) {
- gtk_widget_show_all (GTK_WIDGET (win));
- gtk_main();
+ /* Remove new mail notifications if exist */
+ modest_platform_remove_new_mail_notifications (FALSE);
}
- if (modest_ui)
- g_object_unref (G_OBJECT(modest_ui));
- return retval;
-}
-
+ gtk_main ();
+cleanup:
+ gdk_threads_leave ();
-static int
-send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc,
- const gchar* subject, const gchar *body)
-{
- ModestMailOperation *mail_operation = NULL;
- TnyList *accounts = NULL;
- TnyIterator *iter = NULL;
- TnyTransportAccount *account = NULL;
- int retval;
-
- accounts = TNY_LIST(tny_simple_list_new ());
- tny_account_store_get_accounts (TNY_ACCOUNT_STORE(modest_runtime_get_account_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;
+ if (!modest_init_uninit ()) {
+ g_printerr ("modest: modest_init_uninit failed\n");
+ retval = 1;
}
- account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current(iter));
- 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));
- if (accounts)
- g_object_unref (G_OBJECT (accounts));
- if (mail_operation)
- g_object_unref (G_OBJECT (mail_operation));
return retval;
}
-
projects / modest / blobdiff