[gnome-session/f18] Added patch that makes sure that gnome-session will accept XSMP clients again after a user cancels s

[Jan Horak]

commit 8555967c7036bfba0dfaf03aed5eba773d79b4f2
Author: Jan Horak <jhorak at redhat.com>
Date:   Mon Mar 4 16:25:17 2013 +0100

    Added patch that makes sure that gnome-session will accept XSMP clients again after a user cancels shutdown.

 gnome-session-691513.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++
 gnome-session.spec         |    7 +++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/gnome-session-691513.patch b/gnome-session-691513.patch
new file mode 100644
index 0000000..1e31af8
--- /dev/null
+++ b/gnome-session-691513.patch
@@ -0,0 +1,50 @@
+From 42356904ef974ca8376158dddd3d36f913f793a0 Mon Sep 17 00:00:00 2001
+From: Michael Chapman <gnome-bugzilla at very.puzzling.org>
+Date: Wed, 06 Feb 2013 00:22:00 +0000
+Subject: xsmp: Re-accept clients if session shutdown is cancelled
+
+This commit makes sure that gnome-session will accept XSMP
+clients again after a user cancels shutdown.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=691513
+---
+diff -up gnome-session-3.6.2/gnome-session/gsm-manager.c.691513 gnome-session-3.6.2/gnome-session/gsm-manager.c
+--- gnome-session-3.6.2/gnome-session/gsm-manager.c.691513	2013-03-04 16:06:52.000000000 +0100
++++ gnome-session-3.6.2/gnome-session/gsm-manager.c	2013-03-04 16:08:20.626077881 +0100
+@@ -1582,6 +1582,7 @@ start_phase (GsmManager *manager)
+                 break;
+         case GSM_MANAGER_PHASE_RUNNING:
+                 possibly_show_fallback_dialog (manager);
++                gsm_xsmp_server_start_accepting_new_clients (manager->priv->xsmp_server);
+                 g_signal_emit (manager, signals[SESSION_RUNNING], 0);
+                 update_idle (manager);
+                 break;
+diff -up gnome-session-3.6.2/gnome-session/gsm-xsmp-server.c.691513 gnome-session-3.6.2/gnome-session/gsm-xsmp-server.c
+--- gnome-session-3.6.2/gnome-session/gsm-xsmp-server.c.691513	2013-03-04 16:06:52.614022514 +0100
++++ gnome-session-3.6.2/gnome-session/gsm-xsmp-server.c	2013-03-04 16:06:52.617022515 +0100
+@@ -256,6 +256,14 @@ gsm_xsmp_server_stop_accepting_new_clien
+         server->priv->stopping = TRUE;
+ }
+ 
++void
++gsm_xsmp_server_start_accepting_new_clients (GsmXsmpServer *server)
++{
++        g_return_if_fail (GSM_IS_XSMP_SERVER (server));
++        g_debug ("gsm_xsmp_server_start");
++        server->priv->stopping = FALSE;
++}
++
+ static void
+ gsm_xsmp_server_set_client_store (GsmXsmpServer *xsmp_server,
+                                   GsmStore      *store)
+diff -up gnome-session-3.6.2/gnome-session/gsm-xsmp-server.h.691513 gnome-session-3.6.2/gnome-session/gsm-xsmp-server.h
+--- gnome-session-3.6.2/gnome-session/gsm-xsmp-server.h.691513	2013-03-04 16:06:52.614022514 +0100
++++ gnome-session-3.6.2/gnome-session/gsm-xsmp-server.h	2013-03-04 16:06:52.617022515 +0100
+@@ -53,6 +53,7 @@ GType               gsm_xsmp_server_get_
+ GsmXsmpServer *     gsm_xsmp_server_new                            (GsmStore      *client_store);
+ void                gsm_xsmp_server_start                          (GsmXsmpServer *server);
+ void                gsm_xsmp_server_stop_accepting_new_clients     (GsmXsmpServer *server);
++void                gsm_xsmp_server_start_accepting_new_clients    (GsmXsmpServer *server);
+ 
+ G_END_DECLS
+ 
diff --git a/gnome-session.spec b/gnome-session.spec
index 5656168..b5bb1f0 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -3,7 +3,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 3.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-session
 Source0: http://download.gnome.org/sources/gnome-session/3.6/%{name}-%{version}.tar.xz
@@ -15,6 +15,7 @@ Patch1: gnome-session-3.3.92-nv30.patch
 Patch2: 0001-main-Set-XDG_MENU_PREFIX.patch
 Patch3: reject-shutdown-clients.patch
 Patch4: gnome-session-3.6.2-swrast.patch
+Patch5: gnome-session-691513.patch
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -87,6 +88,7 @@ Desktop file to add GNOME to display manager session menu.
 %patch2 -p1 -b .set-xdg-menu-prefix
 %patch3 -p1 -b .reject-shutdown-clients
 %patch4 -p1 -b .swrast
+%patch5 -p1 -b .691513
 
 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
 
@@ -160,6 +162,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 
 %changelog
+* Mon Mar  4 2013 Jan Horak <jhorak at redhat.com> - 3.6.2-4
+- Added ustream patch to fix session management handling (rhbz#894537)
+
 * Mon Dec 10 2012 Adam Jackson <ajax at redhat.com> 3.6.2-3
 - gnome-session-3.6.2-swrast.patch: Allow swrast classic. On x86 this has no
   effect since we build llvmpipe instead, but for arches where there's nothing