* 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 "modest-conf.h"
-#include "modest-account-mgr.h"
-#include "modest-identity-mgr.h"
-#include "modest-ui.h"
-#include "modest-icon-factory.h"
+#include <modest-runtime.h>
+#include <modest-init.h>
+#include "modest-platform.h"
+#include "modest-ui-actions.h"
+#include <widgets/modest-main-window.h>
+
+typedef struct {
+ gulong queue_handler;
+ gulong window_list_handler;
+ gulong get_password_handler;
+} MainSignalHandlers;
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
+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_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);
+ }
+
+ gdk_threads_leave ();
-#ifdef MODEST_ENABLE_HILDON /* Hildon includes */
-#include <libosso.h>
-#endif /* MODEST_ENABLE_HILDON */
+ return FALSE;
+}
-/* 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 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. We can exit as well if the main window is hidden
+ and it's the only one */
+ if (modest_window_mgr_num_windows (mgr) == 0)
+ g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
+}
-static gboolean hildon_init (); /* NOP if HILDON is not defined */
+static void
+on_window_list_empty (ModestWindowMgr *window_mgr,
+ gpointer user_data)
+{
+ ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue ();
-static int start_ui (ModestConf *conf, const gchar* mailto, const gchar *cc,
- const gchar *bcc, const gchar* subject, const gchar *body);
+ /* 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);
+}
int
main (int argc, char *argv[])
{
- GOptionContext *context = NULL;
- ModestConf *modest_conf = NULL;
- ModestUI *modest_ui = NULL;
+ /* 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;
+ MainSignalHandlers *handlers;
+
+ if (argc >= 2) {
+ if (strcmp (argv[1], "showui") == 0)
+ show_ui_without_top_application_method = TRUE;
+ }
- GError *err = NULL;
- int retval = MODEST_ERR_NONE;
+ if (!show_ui_without_top_application_method) {
+ g_print ("modest: use 'modest showui' to start from cmdline with UI\n");
+ }
- static gboolean update, debug, batch;
- static gchar *mailto, *subject, *bcc, *cc, *body;
-
- 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>"},
- { "subject", 's', 0, G_OPTION_ARG_STRING, &subject,
- "Subject for a new mail"},
- { "body", 'b', 0, G_OPTION_ARG_STRING, &body,
- "Body for a new email"},
- { "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 }
- };
-
- g_type_init ();
-
- 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);
+ if (!g_thread_supported())
+ g_thread_init (NULL);
+
+ gdk_threads_init ();
+ gdk_threads_enter ();
- modest_conf = MODEST_CONF(modest_conf_new());
- if (!modest_conf) {
- g_printerr ("modest: failed to initialize config system, exiting\n");
- retval = MODEST_ERR_CONF;
+ if (!getenv("DISPLAY")) {
+ g_printerr ("modest: DISPLAY env variable is not set\n");
+ retval = 1;
goto cleanup;
}
- gtk_init (&argc, &argv);
- retval = start_ui (modest_conf, mailto, cc, bcc, subject, body);
-
-cleanup:
- g_object_unref (modest_conf);
-
- return retval;
-}
-
-
-int
-start_ui (ModestConf *conf, 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;
+ if (!gtk_init_check (&argc, &argv)) {
+ g_printerr ("modest: failed to initialize gtk\n");
+ retval = 1;
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 (!modest_init (argc, argv)) {
+ g_printerr ("modest: cannot init modest\n");
+ retval = 1;
goto cleanup;
}
- 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
- ok = modest_ui_show_main_window (modest_ui);
-
- if (!ok) {
- g_printerr ("modest: showing window failed");
- retval = MODEST_ERR_RUN;
- goto cleanup;
- }
+ 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 (modest_runtime_get_account_store (),
+ "password_requested",
+ G_CALLBACK (modest_ui_actions_on_password_requested),
+ 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;
+ }
- gtk_main();
+ /* Remove new mail notifications if exist */
+ modest_platform_remove_new_mail_notifications (FALSE);
+ }
-cleanup:
- if (modest_ui)
- g_object_unref (modest_ui);
-
- modest_icon_factory_uninit ();
- return retval;
-}
-
+ gtk_main ();
-static gboolean
-hildon_init ()
-{
-#ifdef MODEST_ENABLE_HILDON
+cleanup:
+ gdk_threads_leave ();
- osso_context_t *osso_context =
- osso_initialize(PACKAGE, PACKAGE_VERSION,
- TRUE, NULL);
-
- if (!osso_context) {
- g_printerr ("modest: failed to aquire osso context, exiting");
- return FALSE;
+ if (!modest_init_uninit ()) {
+ g_printerr ("modest: modest_init_uninit failed\n");
+ retval = 1;
}
-#endif /* MODEST_ENABLE_HILDON */
- return TRUE;
+ return retval;
}
projects / modest / blobdiff