*/
#include <config.h>
-
-#include <glib.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>
+#include <glib.h>
+#include "modest-runtime.h"
+#include "modest-init.h"
+#include "modest-platform.h"
+#include "modest-ui-actions.h"
+
+static gboolean show_ui = FALSE;
+static GOptionEntry option_entries [] =
+{
+ { "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
gdk_threads_enter ();
mail_op_queue = modest_runtime_get_mail_operation_queue ();
- if (modest_mail_operation_queue_running_shutdown (mail_op_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 (),
+ g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (),
handlers->queue_handler);
- g_signal_handler_disconnect (modest_runtime_get_window_mgr (),
+ 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 ();
-
- g_free (handlers);
-
+
gtk_main_quit ();
} else {
ModestMailOperation *mail_op;
modest_mail_operation_shutdown (mail_op, modest_runtime_get_account_store ());
g_object_unref (mail_op);
}
-
+
gdk_threads_leave ();
return FALSE;
{
ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+ if (!modest_runtime_get_allow_shutdown ())
+ return;
+
/* 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)
+ if (modest_window_mgr_get_num_windows (mgr) == 0)
g_idle_add_full (G_PRIORITY_LOW, on_idle_exit_modest, user_data, NULL);
}
{
ModestMailOperationQueue *queue = modest_runtime_get_mail_operation_queue ();
+ 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);
int
main (int argc, char *argv[])
{
- /* 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
+ /* 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;
+ 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);
+ }
+ g_option_context_free (context);
- if (argc >= 2) {
- if (strcmp (argv[1], "showui") == 0)
- show_ui_without_top_application_method = TRUE;
+ if (!show_ui) {
+ g_print ("modest: use 'modest -s' to start from cmdline with UI\n");
}
- if (!show_ui_without_top_application_method) {
- g_print ("modest: use 'modest showui' to start from cmdline with UI\n");
- }
-
if (!g_thread_supported())
g_thread_init (NULL);
retval = 1;
goto cleanup;
}
-
+
if (!gtk_init_check (&argc, &argv)) {
g_printerr ("modest: failed to initialize gtk\n");
retval = 1;
goto cleanup;
}
- /* Connect to the queue-emtpy signal */
+ /* 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));
- handlers->queue_handler =
+ /* 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);
- handlers->window_list_handler =
+ /* 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_without_top_application_method) {
- ModestWindow *main_win;
+ if (show_ui) {
+ ModestWindow *window;
- /* this will create & register the window */
- main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
- TRUE);
- if (!main_win) {
+ 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;
}
-
- gtk_widget_show_all (GTK_WIDGET(main_win));
-
/* Remove new mail notifications if exist */
modest_platform_remove_new_mail_notifications (FALSE);
}
-
+
gtk_main ();
cleanup:
projects / modest / blobdiff