[Pkg-xfce-commits] r7225 - desktop/trunk/xfce4-session/debian/patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-11-08 21:53:46 +0000 (Thu, 08 Nov 2012)
New Revision: 7225

Modified:
   desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch
Log:
use the version committed upstream


Modified: 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	2012-11-08 07:01:32 UTC (rev 7224)
+++ desktop/trunk/xfce4-session/debian/patches/06-Handle-multiple-interactive-session-save-bug-5379.patch	2012-11-08 21:53:46 UTC (rev 7225)
@@ -1,6 +1,6 @@
-From 9f3077be682355e1cd07e9a9463e76307292208c Mon Sep 17 00:00:00 2001
+From cec1b90a752794091032994865e79062d6ce3e6f Mon Sep 17 00:00:00 2001
 From: Dimitar Zhekov <hamster at mbox.contact.bg>
-Date: Thu, 30 Aug 2012 22:52:14 +0200
+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
@@ -12,13 +12,15 @@
  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         save_session;
  
    gboolean         session_chooser;
    gchar           *session_name;
@@ -30,7 +32,7 @@
  
    manager->pending_properties = g_queue_new ();
    manager->starting_properties = g_queue_new ();
-@@ -981,7 +983,9 @@ xfsm_manager_interact (XfsmManager *mana
+@@ -981,7 +983,9 @@ xfsm_manager_interact (XfsmManager *manager,
            XfsmClient *cl = lp->data;
            if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING)
              {
@@ -41,7 +43,7 @@
                return;
              }
          }
-@@ -1158,44 +1162,47 @@ xfsm_manager_save_yourself_global (XfsmM
+@@ -1158,44 +1162,47 @@ xfsm_manager_save_yourself_global (XfsmManager     *manager,
      }
  #endif
  
@@ -59,13 +61,13 @@
 +       * (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! */
++  
 +  /* handle legacy applications first! */
 +  if (manager->save_session)
        xfsm_legacy_perform_session_save ();
@@ -120,7 +122,7 @@
      }
  }
  
-@@ -1267,7 +1274,12 @@ xfsm_manager_save_yourself_done (XfsmMan
+@@ -1267,7 +1274,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager,
                                   XfsmClient  *client,
                                   gboolean     success)
  {
@@ -134,7 +136,7 @@
      {
        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
+@@ -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 */
@@ -144,3 +146,6 @@
  
    if (manager->state == XFSM_MANAGER_CHECKPOINT)
      {
+-- 
+1.7.10.4
+