[Pkg-xfce-commits] r7432 - in desktop/trunk/xfce4-session/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 09:14:15 UTC 2013
Author: corsac
Date: 2013-05-21 21:14:15 +0000 (Tue, 21 May 2013)
New Revision: 7432
Removed:
desktop/trunk/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch
desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch
desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch
desktop/trunk/xfce4-session/debian/patches/series
Modified:
desktop/trunk/xfce4-session/debian/changelog
Log:
* New upstream release.
* debian/patches:
- drop all patches, included upstream.
Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog 2013-05-21 21:12:05 UTC (rev 7431)
+++ desktop/trunk/xfce4-session/debian/changelog 2013-05-21 21:14:15 UTC (rev 7432)
@@ -1,9 +1,12 @@
-xfce4-session (4.10.0-3) UNRELEASED; urgency=low
+xfce4-session (4.10.1-1) UNRELEASED; urgency=low
+ * New upstream release.
* debian/rules:
- enable all hardening flags.
+ * debian/patches:
+ - drop all patches, included upstream.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 21 May 2013 23:11:55 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 21 May 2013 23:12:22 +0200
xfce4-session (4.10.0-2) experimental; urgency=low
Deleted: desktop/trunk/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch 2013-05-21 21:12:05 UTC (rev 7431)
+++ desktop/trunk/xfce4-session/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch 2013-05-21 21:14:15 UTC (rev 7432)
@@ -1,151 +0,0 @@
-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(-)
-
-diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
-index bf6a446..35811c5 100644
---- a/xfce4-session/xfsm-manager.c
-+++ b/xfce4-session/xfsm-manager.c
-@@ -98,6 +98,7 @@ struct _XfsmManager
-
- XfsmShutdownType shutdown_type;
- XfsmShutdown *shutdown_helper;
-+ gboolean save_session;
-
- gboolean session_chooser;
- gchar *session_name;
-@@ -230,6 +231,7 @@ xfsm_manager_init (XfsmManager *manager)
- manager->failsafe_mode = TRUE;
- manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT;
- manager->shutdown_helper = xfsm_shutdown_get ();
-+ manager->save_session = TRUE;
-
- manager->pending_properties = g_queue_new ();
- manager->starting_properties = g_queue_new ();
-@@ -989,7 +991,9 @@ xfsm_manager_interact (XfsmManager *manager,
- 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;
- }
- }
-@@ -1138,44 +1142,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager,
- }
- }
-
-- 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;
-+ }
-
-- /* handle legacy applications first! */
-- xfsm_legacy_perform_session_save ();
-+ xfsm_manager_set_state (manager,
-+ shutdown
-+ ? XFSM_MANAGER_SHUTDOWN
-+ : XFSM_MANAGER_CHECKPOINT);
-
-- 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;
-+ /* handle legacy applications first! */
-+ if (manager->save_session)
-+ xfsm_legacy_perform_session_save ();
-
-- /* 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);
- }
- }
-
-@@ -1249,7 +1256,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager,
- 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",
-@@ -1521,7 +1533,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager)
- 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)
- {
---
-1.7.10.4
-
Deleted: 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 2013-05-21 21:12:05 UTC (rev 7431)
+++ desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch 2013-05-21 21:14:15 UTC (rev 7432)
@@ -1,151 +0,0 @@
-From cec1b90a752794091032994865e79062d6ce3e6f Mon Sep 17 00:00:00 2001
-From: Dimitar Zhekov <hamster at mbox.contact.bg>
-Date: Thu, 8 Nov 2012 18:04:47 +0100
-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(-)
-
-diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
-index 3078d6a..92ae8e3 100644
---- 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 *manager,
- 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 (XfsmManager *manager,
- }
- #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;
-+ }
-
-- /* handle legacy applications first! */
-+ xfsm_manager_set_state (manager,
-+ shutdown
-+ ? XFSM_MANAGER_SHUTDOWN
-+ : XFSM_MANAGER_CHECKPOINT);
-+
-+ /* 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 (XfsmManager *manager,
- 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 (XfsmManager *manager)
- 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)
- {
---
-1.7.10.4
-
Deleted: desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch 2013-05-21 21:12:05 UTC (rev 7431)
+++ desktop/trunk/xfce4-session/debian/patches/07-Store-the-watch-function-id-to-avoid-possible-double.patch 2013-05-21 21:14:15 UTC (rev 7432)
@@ -1,26 +0,0 @@
-From ab391138cacc62ab184a338e237c4430356b41f9 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick at xfce.org>
-Date: Fri, 26 Apr 2013 20:05:10 +0200
-Subject: [PATCH] Store the watch function id to avoid possible double free
- (bug #9709).
-
----
- xfce4-session/xfsm-startup.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/xfce4-session/xfsm-startup.c
-+++ b/xfce4-session/xfsm-startup.c
-@@ -567,9 +567,10 @@ xfsm_startup_start_properties (XfsmPrope
- child_watch_data = g_new (XfsmStartupData, 1);
- child_watch_data->manager = g_object_ref (manager);
- child_watch_data->properties = properties;
-- g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
-- xfsm_startup_child_watch, child_watch_data,
-- (GDestroyNotify) xfsm_startup_data_free);
-+ child_watch_data->properties->child_watch_id =
-+ g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
-+ xfsm_startup_child_watch, child_watch_data,
-+ (GDestroyNotify) xfsm_startup_data_free);
-
- /* set a timeout -- client must register in a a certain amount of time
- * or it's assumed to be broken/have issues. */
Deleted: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series 2013-05-21 21:12:05 UTC (rev 7431)
+++ desktop/trunk/xfce4-session/debian/patches/series 2013-05-21 21:14:15 UTC (rev 7432)
@@ -1 +0,0 @@
-0001-Handle-multiple-interactive-session-save-bug-5379.patch
More information about the Pkg-xfce-commits
mailing list