* src/modest-main.c: disable shutdown timeout by default.
* src/hildon2/modest.desktop.in: set a shutdown timeout for hildon 2.2
.desktop (this way it will work for prestarted mode).
Type=Application
Name=mcen_ap_name
Comment=mcen_ap_name_thumb
Type=Application
Name=mcen_ap_name
Comment=mcen_ap_name_thumb
-Exec=@prefix@/bin/modest
+Exec=@prefix@/bin/modest -t 30
X-Text-Domain=modest
X-Osso-Service=com.nokia.modest
X-Text-Domain=modest
X-Osso-Service=com.nokia.modest
#include "modest-ui-actions.h"
static gboolean show_ui = FALSE;
#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 },
static GOptionEntry option_entries [] =
{
{ "show-ui", 's', 0, G_OPTION_ARG_NONE, &show_ui, "Show UI immediately, so no wait for DBUS activation", NULL },
/* Remove new mail notifications if exist */
modest_platform_remove_new_mail_notifications (FALSE);
} else {
/* 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);
+ }