* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+#include <config.h>
+#include <gdk/gdk.h>
+#include <string.h>
#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.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-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 <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);
-
-static int send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc,
- const gchar* subject, const gchar *body);
+#include "modest-runtime.h"
+#include "modest-init.h"
+#include "modest-platform.h"
+#include "modest-ui-actions.h"
-int
-main (int argc, char *argv[])
+static gboolean show_ui = FALSE;
+static GOptionEntry option_entries [] =
{
- GOptionContext *context = NULL;
- TnyPlatformFactory *fact = 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 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 <addresses> (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 }
- };
-
- bindtextdomain (GETTEXT_PACKAGE, MODESTLOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
- g_type_init ();
- g_thread_init (NULL);
-
- 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;
- 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;
- goto cleanup;
+ { "show-ui", 's', 0, G_OPTION_ARG_NONE, &show_ui, "Show UI immediately, so no wait for DBUS activation", NULL },
+ { NULL }
+};
+
+typedef struct {
+ gulong queue_handler;
+ gulong window_list_handler;
+ gulong get_password_handler;
+} MainSignalHandlers;
+
+static gboolean
+on_idle_exit_modest (gpointer data)
+{
+ MainSignalHandlers *handlers;
+ ModestMailOperationQueue *mail_op_queue;
+
+ /* Protect the Gtk calls */
+ gdk_threads_enter ();
+ mail_op_queue = modest_runtime_get_mail_operation_queue ();
+
+ if (modest_tny_account_store_is_shutdown (modest_runtime_get_account_store ()) &&
+ modest_mail_operation_queue_running_shutdown (mail_op_queue)) {
+
+ /* Disconnect signals. Will be freed by the destroy notify */
+ handlers = (MainSignalHandlers *) data;
+ g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (),
+ handlers->queue_handler);
+ g_signal_handler_disconnect (modest_runtime_get_window_mgr (),
+ handlers->window_list_handler);
+ g_signal_handler_disconnect (modest_runtime_get_account_store (),
+ handlers->get_password_handler);
+ g_free (handlers);
+
+ /* Wait for remaining tasks */
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+
+ gtk_main_quit ();
+ } else {
+ ModestMailOperation *mail_op;
+ mail_op = modest_mail_operation_new (NULL);
+ modest_mail_operation_queue_add (mail_op_queue, mail_op);
+ modest_mail_operation_shutdown (mail_op, modest_runtime_get_account_store ());
+ g_object_unref (mail_op);
}
- 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);
-
-
-cleanup:
-
- return retval;
-}
+ gdk_threads_leave ();
+ return FALSE;
+}
-static int
-start_ui (const gchar* mailto, const gchar *cc, const gchar *bcc,
- const gchar* subject, const gchar *body)
+static void
+on_queue_empty (ModestMailOperationQueue *queue,
+ gpointer user_data)
{
+ ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
- 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;
- goto cleanup;
- }
-
- modest_icon_factory_init ();
+ if (!modest_runtime_get_allow_shutdown ())
+ return;
- if (!hildon_init ()) { /* NOP if hildon is not defined */
- g_printerr ("modest: failed to initialize hildon, exiting\n");
- retval = MODEST_ERR_HILDON;
- goto cleanup;
- }
+ /* Exit if the queue is empty and there are no more
+ windows. We can exit as well if the main window is hidden
+ and it's the only one */
+ if (modest_window_mgr_get_num_windows (mgr) == 0)
+ g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
+}
- 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
- win = modest_ui_main_window (modest_ui);
-
- if (win) {
- gtk_widget_show (win);
- gtk_main();
- }
-cleanup:
- if (modest_ui)
- g_object_unref (modest_ui);
+static void
+on_window_list_empty (ModestWindowMgr *window_mgr,
+ gpointer user_data)
+{
+ ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue ();
- modest_icon_factory_uninit ();
- return retval;
-}
+ if (!modest_runtime_get_allow_shutdown ())
+ return;
+ /* 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, user_data, NULL);
+}
-static gboolean
-hildon_init ()
+int
+main (int argc, char *argv[])
{
-#if MODEST_PLATFORM_ID==2
-
- osso_context_t *osso_context =
- osso_initialize(PACKAGE, PACKAGE_VERSION,
- TRUE, NULL);
- if (!osso_context) {
- g_printerr ("modest: failed to acquire osso context\n");
- return FALSE;
+ /* 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.: */
+ int retval = 0;
+ MainSignalHandlers *handlers;
+ ModestTnyAccountStore *acc_store;
+
+ GError *error = NULL;
+ GOptionContext *context;
+
+ ModestWindowMgr *mgr;
+
+ context = g_option_context_new ("- Modest email client");
+ g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE);
+ g_option_context_add_group (context, gtk_get_option_group (TRUE));
+ if (!g_option_context_parse (context, &argc, &argv, &error)) {
+ g_print ("option parsing failed: %s\n", error->message);
+ g_option_context_free (context);
+ exit (1);
}
-
-#endif /* MODEST_PLATFORM_ID==2 */
+ g_option_context_free (context);
- return TRUE;
-}
+ if (!show_ui) {
+ g_print ("modest: use 'modest -s' to start from cmdline with UI\n");
+ }
+ if (!g_thread_supported())
+ g_thread_init (NULL);
+ gdk_threads_init ();
+ gdk_threads_enter ();
-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;
-
- 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);
-
- 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;
+ if (!getenv("DISPLAY")) {
+ g_printerr ("modest: DISPLAY env variable is not set\n");
+ retval = 1;
goto cleanup;
}
- account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current(iter));
-
- mail_operation = modest_mail_operation_new ();
+ if (!gtk_init_check (&argc, &argv)) {
+ g_printerr ("modest: failed to initialize gtk\n");
+ retval = 1;
+ goto cleanup;
+ }
- modest_mail_operation_send_new_mail (mail_operation,
- account,
- "djcb@djcbsoftware.nl", mailto, cc, bcc,
- subject, body, NULL);
+ if (!modest_init (argc, argv)) {
+ g_printerr ("modest: cannot init modest\n");
+ retval = 1;
+ goto cleanup;
+ }
+ /* Create the account store & launch send queues */
+ acc_store = modest_runtime_get_account_store ();
+ modest_tny_account_store_start_send_queues (acc_store);
+
+ handlers = g_malloc0 (sizeof (MainSignalHandlers));
+ /* Connect to the "queue-emtpy" signal */
+ handlers->queue_handler =
+ g_signal_connect (modest_runtime_get_mail_operation_queue (),
+ "queue-empty",
+ G_CALLBACK (on_queue_empty),
+ handlers);
+
+ /* Connect to the "window-list-emtpy" signal */
+ handlers->window_list_handler =
+ g_signal_connect (modest_runtime_get_window_mgr (),
+ "window-list-empty",
+ G_CALLBACK (on_window_list_empty),
+ handlers);
+
+ /* Connect to the "password-requested" signal */
+ handlers->get_password_handler =
+ g_signal_connect (acc_store,
+ "password_requested",
+ G_CALLBACK (modest_ui_actions_on_password_requested),
+ NULL);
+
+ /* Create cached windows */
+ mgr = modest_runtime_get_window_mgr ();
+ modest_window_mgr_create_caches (mgr);
+
+ /* 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) {
+ ModestWindow *window;
+
+ mgr = modest_runtime_get_window_mgr();
+ window = modest_window_mgr_show_initial_window (mgr);
+ if (!window) {
+ g_printerr ("modest: failed to get main window instance\n");
+ retval = 1;
+ goto cleanup;
+ }
+ }
- 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! */
+ gtk_main ();
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));
+ gdk_threads_leave ();
+
+ if (!modest_init_uninit ()) {
+ g_printerr ("modest: modest_init_uninit failed\n");
+ retval = 1;
+ }
return retval;
}
-
projects / modest / blobdiff