[Pkg-xfce-commits] r7224 - in desktop/trunk/xfce4-session/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Thu Nov 8 07:01:32 UTC 2012
Author: corsac
Date: 2012-11-08 07:01:32 +0000 (Thu, 08 Nov 2012)
New Revision: 7224
Added:
desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch
Modified:
desktop/trunk/xfce4-session/debian/changelog
desktop/trunk/xfce4-session/debian/patches/series
Log:
* debian/patches:
- 06-Handle-multiple-interactive-session-save-bug-5379 added, fix session
not correctly saved in some corner cases. closes: #632404
Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2012-11-01 14:13:34 UTC (rev 7223)
+++ desktop/trunk/xfce4-session/debian/changelog 2012-11-08 07:01:32 UTC (rev 7224)
@@ -1,3 +1,11 @@
+xfce4-session (4.8.3-3) UNRELEASED; urgency=low
+
+ * debian/patches:
+ - 06-Handle-multiple-interactive-session-save-bug-5379 added, fix session
+ not correctly saved in some corner cases. closes: #632404
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 02 Sep 2012 14:53:47 +0200
+
xfce4-session (4.8.3-2) unstable; urgency=low
[ Lionel Le Folgoc ]
Added: desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch (rev 0)
+++ desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch 2012-11-08 07:01:32 UTC (rev 7224)
@@ -0,0 +1,146 @@
+From 9f3077be682355e1cd07e9a9463e76307292208c Mon Sep 17 00:00:00 2001
+From: Dimitar Zhekov <hamster at mbox.contact.bg>
+Date: Thu, 30 Aug 2012 22:52:14 +0200
+Subject: [PATCH] Handle multiple interactive session save (bug #5379).
+
+Additionnaly, we now use SmSaveGlobal on log out / shutdown without
+session save which avoids data loss. Previously clients would not save
+anything on log out without session save.
+
+Based on original work by Chris Bainbridge (chris.bainbridge at gmail.com).
+---
+ xfce4-session/xfsm-manager.c | 81 ++++++++++++++++++++++++------------------
+ 1 file changed, 47 insertions(+), 34 deletions(-)
+
+--- a/xfce4-session/xfsm-manager.c
++++ b/xfce4-session/xfsm-manager.c
+@@ -96,6 +96,7 @@ struct _XfsmManager
+
+ XfsmManagerState state;
+ XfsmShutdownType shutdown_type;
++ gboolean save_session;
+
+ gboolean session_chooser;
+ gchar *session_name;
+@@ -225,6 +226,7 @@ xfsm_manager_init (XfsmManager *manager)
+ manager->session_chooser = FALSE;
+ manager->failsafe_mode = TRUE;
+ manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT;
++ manager->save_session = TRUE;
+
+ manager->pending_properties = g_queue_new ();
+ manager->starting_properties = g_queue_new ();
+@@ -981,7 +983,9 @@ xfsm_manager_interact (XfsmManager *mana
+ XfsmClient *cl = lp->data;
+ if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING)
+ {
+- xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT);
++ /* a client is already interacting, so new client has to wait */
++ xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT);
++ xfsm_manager_cancel_client_save_timeout(manager, client);
+ return;
+ }
+ }
+@@ -1158,44 +1162,47 @@ xfsm_manager_save_yourself_global (XfsmM
+ }
+ #endif
+
+- if (!shutdown || shutdown_save)
++ /* don't save the session if shutting down without save */
++ manager->save_session = !shutdown || shutdown_save;
++
++ if (save_type == SmSaveBoth && !manager->save_session)
+ {
+- xfsm_manager_set_state (manager,
+- shutdown
+- ? XFSM_MANAGER_SHUTDOWN
+- : XFSM_MANAGER_CHECKPOINT);
++ /* saving the session, so clients should
++ * (prompt to) save the user data only */
++ save_type = SmSaveGlobal;
++ }
++
++ xfsm_manager_set_state (manager,
++ shutdown
++ ? XFSM_MANAGER_SHUTDOWN
++ : XFSM_MANAGER_CHECKPOINT);
+
+- /* handle legacy applications first! */
++ /* handle legacy applications first! */
++ if (manager->save_session)
+ xfsm_legacy_perform_session_save ();
+
+- for (lp = g_queue_peek_nth_link (manager->running_clients, 0);
+- lp;
+- lp = lp->next)
+- {
+- XfsmClient *client = lp->data;
+- XfsmProperties *properties = xfsm_client_get_properties (client);
+- const gchar *program;
+-
+- /* xterm's session management is broken, so we won't
+- * send a SAVE YOURSELF to xterms */
+- program = xfsm_properties_get_string (properties, SmProgram);
+- if (program != NULL && strcasecmp (program, "xterm") == 0)
+- continue;
++ for (lp = g_queue_peek_nth_link (manager->running_clients, 0);
++ lp;
++ lp = lp->next)
++ {
++ XfsmClient *client = lp->data;
++ XfsmProperties *properties = xfsm_client_get_properties (client);
++ const gchar *program;
+
+- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
+- {
+- SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown,
+- interact_style, fast);
+- }
++ /* xterm's session management is broken, so we won't
++ * send a SAVE YOURSELF to xterms */
++ program = xfsm_properties_get_string (properties, SmProgram);
++ if (program != NULL && strcasecmp (program, "xterm") == 0)
++ continue;
+
+- xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
+- xfsm_manager_start_client_save_timeout (manager, client);
++ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
++ {
++ SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown,
++ interact_style, fast);
+ }
+- }
+- else
+- {
+- /* shutdown session without saving */
+- xfsm_manager_perform_shutdown (manager);
++
++ xfsm_client_set_state (client, XFSM_CLIENT_SAVING);
++ xfsm_manager_start_client_save_timeout (manager, client);
+ }
+ }
+
+@@ -1267,7 +1274,12 @@ xfsm_manager_save_yourself_done (XfsmMan
+ XfsmClient *client,
+ gboolean success)
+ {
+- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL)
++ /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in
++ XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone
++ (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */
++ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING &&
++ xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL &&
++ xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT)
+ {
+ xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being "
+ "in save mode. Prepare to be nuked!\n",
+@@ -1539,7 +1551,8 @@ xfsm_manager_complete_saveyourself (Xfsm
+ xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n");
+
+ /* all clients done, store session data */
+- xfsm_manager_store_session (manager);
++ if (manager->save_session)
++ xfsm_manager_store_session (manager);
+
+ if (manager->state == XFSM_MANAGER_CHECKPOINT)
+ {
Modified: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series 2012-11-01 14:13:34 UTC (rev 7223)
+++ desktop/trunk/xfce4-session/debian/patches/series 2012-11-08 07:01:32 UTC (rev 7224)
@@ -2,3 +2,4 @@
03_respect-save-settings-logout-plugin.patch
04_fix-missing-lm.patch
05_force-xfsettingsd-start.patch
+06-Handle-multiple-interactive-session-save-bug-5379.patch
More information about the Pkg-xfce-commits
mailing list