gnome-session r5373 - in trunk: . gnome-session

[vuntz svn gnome org]

Author: vuntz
Date: Wed Apr  8 12:49:45 2009
New Revision: 5373
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5373&view=rev

Log:
2009-04-08  Vincent Untz  <vuntz gnome org>

	* gnome-session/gsm-xsmp-client.c: (save_yourself_done_callback): only
	call SmsSaveComplete() if we are still in a SaveYourself state. My
	previous change about this didn't take into account the case where the
	logout is cancelled, in which case SmsSaveComplete() shouldn't be
	called.


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	Wed Apr  8 12:49:45 2009
@@ -1237,8 +1237,10 @@
                  client->priv->description,
                  success ? "True" : "False");
 
-        client->priv->current_save_yourself = -1;
-        SmsSaveComplete (client->priv->conn);
+	if (client->priv->current_save_yourself != -1) {
+		SmsSaveComplete (client->priv->conn);
+		client->priv->current_save_yourself = -1;
+	}
 
         /* If success is false then the application couldn't save data. Nothing
          * the session manager can do about, though. FIXME: we could display a