gnome-session r4970 - in trunk: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Tue Aug 19 00:26:25 2008
New Revision: 4970
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4970&view=rev

Log:
2008-08-18  William Jon McCann  <jmccann redhat com>

	* gnome-session/gsm-xsmp-client.c
	(save_yourself_phase2_request_callback):
	Honor SaveYourselfPhase2Request as a valid
	SaveYourself response.
	Fixes #548259



Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-xsmp-client.c

Modified: trunk/gnome-session/gsm-xsmp-client.c
==============================================================================
--- trunk/gnome-session/gsm-xsmp-client.c	(original)
+++ trunk/gnome-session/gsm-xsmp-client.c	Tue Aug 19 00:26:25 2008
@@ -936,7 +936,21 @@
         g_debug ("GsmXSMPClient: Client '%s' received SaveYourselfPhase2Request",
                  client->priv->description);
 
-        /* FIXME: change priority so this client runs at the end */
+        /* Treat this just like a SaveYourselfDone */
+        if (client->priv->current_save_yourself == SmSaveLocal) {
+                client->priv->current_save_yourself = -1;
+                SmsSaveComplete (client->priv->conn);
+        } else {
+                client->priv->current_save_yourself = -1;
+        }
+
+        /* this is a valid response to SaveYourself and therefore
+           may be a response to a QES or ES */
+        gdm_client_end_session_response (GSM_CLIENT (client),
+                                         TRUE,
+                                         NULL);
+
+        /* FIXME: change priority so this client runs at the end? */
 }
 
 static void