summaryrefslogtreecommitdiff
path: root/mate-session
diff options
context:
space:
mode:
authorClement Lefebvre <[email protected]>2015-10-19 09:25:02 +0100
committerClement Lefebvre <[email protected]>2015-10-19 09:25:02 +0100
commitc1b21ea58c3811aef7ee747671817dce44229796 (patch)
tree46c7ccdf00fc721bb89dcdd187f0b414fa68a575 /mate-session
parentc553068a78c7d26a57b061388c587d90719c4b70 (diff)
parent9b04b4eabac8256c81272d58f7d1c2bd895c977c (diff)
downloadmate-session-manager-c1b21ea58c3811aef7ee747671817dce44229796.tar.bz2
mate-session-manager-c1b21ea58c3811aef7ee747671817dce44229796.tar.xz
Merge pull request #102 from clefebvre/exit_timeout_1sec
Only wait 1 second max on logout/shutdown
Diffstat (limited to 'mate-session')
-rw-r--r--mate-session/gsm-manager.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index c3c7c12..db392b8 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -74,6 +74,11 @@
#define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
+/* In the exit phase, all apps were already given the chance to inhibit the session end
+ * At that stage we don't want to wait much for apps to respond, we want to exit, and fast.
+ */
+#define GSM_MANAGER_EXIT_PHASE_TIMEOUT 1 /* seconds */
+
#define MDM_FLEXISERVER_COMMAND "mdmflexiserver"
#define MDM_FLEXISERVER_ARGS "--startnew Standard"
@@ -876,7 +881,7 @@ static void
do_phase_exit (GsmManager *manager)
{
if (gsm_store_size (manager->priv->clients) > 0) {
- manager->priv->phase_timeout_id = g_timeout_add_seconds (GSM_MANAGER_PHASE_TIMEOUT,
+ manager->priv->phase_timeout_id = g_timeout_add_seconds (GSM_MANAGER_EXIT_PHASE_TIMEOUT,
(GSourceFunc)on_phase_timeout,
manager);