Set privacy note font to small.

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index f7bdf96..721b0bb 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -37,7 +37,7 @@
 #include "modest-ui-actions.h"
 
 static gboolean show_ui = FALSE;
-static gint shutdown_timeout = 30;
+static gint shutdown_timeout = 0;
 static GOptionEntry option_entries [] =
 {
        { "show-ui", 's', 0, G_OPTION_ARG_NONE, &show_ui, "Show UI immediately, so no wait for DBUS activation", NULL },
@@ -145,14 +145,17 @@ main (int argc, char *argv[])
        GError *error;
        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);
 
        show_ui_without_top_application_method = show_ui;
 
@@ -211,6 +214,10 @@ main (int argc, char *argv[])
                                  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.
@@ -219,7 +226,6 @@ main (int argc, char *argv[])
         */
        if (show_ui_without_top_application_method) {
                ModestWindow *window;
-               ModestWindowMgr *mgr;
 
                modest_runtime_set_allow_shutdown (TRUE);
                mgr = modest_runtime_get_window_mgr();
@@ -232,8 +238,10 @@ main (int argc, char *argv[])
                /* Remove new mail notifications if exist */
                modest_platform_remove_new_mail_notifications (FALSE);
        } else {
-               modest_runtime_set_allow_shutdown (FALSE);
-               shutdown_timeout_id = g_timeout_add_seconds (shutdown_timeout * 60, shutdown_timeout_handler, NULL);
+               if (shutdown_timeout > 0) {
+                       modest_runtime_set_allow_shutdown (FALSE);
+                       shutdown_timeout_id = g_timeout_add_seconds (shutdown_timeout * 60, shutdown_timeout_handler, NULL);
+               }
        }
 
        gtk_main ();