|
 |
cf6cdf |
From 89ae27922b1a07f310ca51957294bedca47e54d9 Mon Sep 17 00:00:00 2001
|
|
|
cf6cdf |
From: Ray Strode <rstrode@redhat.com>
|
|
|
cf6cdf |
Date: Fri, 20 Dec 2013 16:14:16 -0500
|
|
|
cf6cdf |
Subject: [PATCH 07/19] manager: Don't clear saved session if autosaving is
|
|
|
cf6cdf |
disabled
|
|
|
cf6cdf |
|
|
|
cf6cdf |
Now that we support on-demand saving again, we need to make sure
|
|
|
cf6cdf |
we don't wipe that away at log out.
|
|
|
cf6cdf |
---
|
|
|
cf6cdf |
gnome-session/gsm-manager.c | 1 -
|
|
|
cf6cdf |
1 file changed, 1 deletion(-)
|
|
|
cf6cdf |
|
|
|
cf6cdf |
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
|
|
|
cf6cdf |
index 3cf421cd..4bb81e04 100644
|
|
|
cf6cdf |
--- a/gnome-session/gsm-manager.c
|
|
|
cf6cdf |
+++ b/gnome-session/gsm-manager.c
|
|
|
cf6cdf |
@@ -1828,61 +1828,60 @@ on_xsmp_client_register_confirmed (GsmXSMPClient *client,
|
|
|
cf6cdf |
app = find_app_for_startup_id (manager, id);
|
|
|
cf6cdf |
|
|
|
cf6cdf |
if (app != NULL) {
|
|
|
cf6cdf |
gsm_app_set_registered (app, TRUE);
|
|
|
cf6cdf |
}
|
|
|
cf6cdf |
}
|
|
|
cf6cdf |
|
|
|
cf6cdf |
static gboolean
|
|
|
cf6cdf |
auto_save_is_enabled (GsmManager *manager)
|
|
|
cf6cdf |
{
|
|
|
cf6cdf |
return g_settings_get_boolean (manager->priv->settings, KEY_AUTOSAVE_ONE_SHOT)
|
|
|
cf6cdf |
|| g_settings_get_boolean (manager->priv->settings, KEY_AUTOSAVE);
|
|
|
cf6cdf |
}
|
|
|
cf6cdf |
|
|
|
cf6cdf |
static void
|
|
|
cf6cdf |
maybe_save_session (GsmManager *manager)
|
|
|
cf6cdf |
{
|
|
|
cf6cdf |
GError *error;
|
|
|
cf6cdf |
|
|
|
cf6cdf |
if (gsm_system_is_login_session (manager->priv->system))
|
|
|
cf6cdf |
return;
|
|
|
cf6cdf |
|
|
|
cf6cdf |
/* We only allow session saving when session is running or when
|
|
|
cf6cdf |
* logging out */
|
|
|
cf6cdf |
if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING &&
|
|
|
cf6cdf |
manager->priv->phase != GSM_MANAGER_PHASE_END_SESSION) {
|
|
|
cf6cdf |
return;
|
|
|
cf6cdf |
}
|
|
|
cf6cdf |
|
|
|
cf6cdf |
if (!auto_save_is_enabled (manager)) {
|
|
|
cf6cdf |
- gsm_session_save_clear ();
|
|
|
cf6cdf |
return;
|
|
|
cf6cdf |
}
|
|
|
cf6cdf |
|
|
|
cf6cdf |
error = NULL;
|
|
|
cf6cdf |
gsm_session_save (manager->priv->clients, manager->priv->apps, &error);
|
|
|
cf6cdf |
|
|
|
cf6cdf |
if (error) {
|
|
|
cf6cdf |
g_warning ("Error saving session: %s", error->message);
|
|
|
cf6cdf |
g_error_free (error);
|
|
|
cf6cdf |
}
|
|
|
cf6cdf |
}
|
|
|
cf6cdf |
|
|
|
cf6cdf |
static void
|
|
|
cf6cdf |
_handle_client_end_session_response (GsmManager *manager,
|
|
|
cf6cdf |
GsmClient *client,
|
|
|
cf6cdf |
gboolean is_ok,
|
|
|
cf6cdf |
gboolean do_last,
|
|
|
cf6cdf |
gboolean cancel,
|
|
|
cf6cdf |
const char *reason)
|
|
|
cf6cdf |
{
|
|
|
cf6cdf |
/* just ignore if received outside of shutdown */
|
|
|
cf6cdf |
if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
|
|
|
cf6cdf |
return;
|
|
|
cf6cdf |
}
|
|
|
cf6cdf |
|
|
|
cf6cdf |
g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
|
|
|
cf6cdf |
|
|
|
cf6cdf |
if (cancel) {
|
|
|
cf6cdf |
cancel_end_session (manager);
|
|
|
cf6cdf |
return;
|
|
|
cf6cdf |
--
|
|
|
cf6cdf |
2.17.0
|
|
|
cf6cdf |
|