gnome-session r4936 - in trunk: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Mon Aug 11 21:45:54 2008
New Revision: 4936
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4936&view=rev

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

	* gnome-session/gsm-manager.c (on_xsmp_client_logout_request),
	(on_store_client_added):
	Add back support for logout via SaveYourselfRequest.
	Based on patch from: Kim Woelders <kim woelders dk>
	Fixes #547069



Modified:
   trunk/ChangeLog
   trunk/gnome-session/gsm-manager.c

Modified: trunk/gnome-session/gsm-manager.c
==============================================================================
--- trunk/gnome-session/gsm-manager.c	(original)
+++ trunk/gnome-session/gsm-manager.c	Mon Aug 11 21:45:54 2008
@@ -1463,6 +1463,25 @@
 }
 
 static void
+on_xsmp_client_logout_request (GsmXSMPClient *client,
+                               gboolean       show_dialog,
+                               GsmManager    *manager)
+{
+        GError *error;
+        int     logout_mode;
+
+        logout_mode = (show_dialog) ? GSM_MANAGER_LOGOUT_MODE_NORMAL :
+                GSM_MANAGER_LOGOUT_MODE_NO_CONFIRMATION;
+
+        error = NULL;
+        gsm_manager_logout (manager, logout_mode, &error);
+        if (error != NULL) {
+                g_warning ("Unable to logout: %s", error->message);
+                g_error_free (error);
+        }
+}
+
+static void
 on_store_client_added (GsmStore   *store,
                        const char *id,
                        GsmManager *manager)
@@ -1479,6 +1498,10 @@
                                   "register-request",
                                   G_CALLBACK (on_xsmp_client_register_request),
                                   manager);
+                g_signal_connect (client,
+                                  "logout-request",
+                                  G_CALLBACK (on_xsmp_client_logout_request),
+                                  manager);
         }
 
         g_signal_connect (client,