r25310 - in /desktop/unstable/gdm3/debian: changelog patches/18_switch_kill_greeter.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Oct  5 21:13:31 2010
New Revision: 25310

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25310
Log:
18_switch_kill_greeter.patch: ensure that the slave process dies 
too. Avoids leaking gdm-simple-slave processes around.

Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/18_switch_kill_greeter.patch

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=25310&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Tue Oct  5 21:13:31 2010
@@ -6,6 +6,8 @@
   * Pass --enable-debug with DEB_BUILD_OPTIONS=debug.
   * 20_endsession_respawn.patch: fix typo introduced in 2.30.5-2 that 
     turns the feature completely off.
+  * 18_switch_kill_greeter.patch: ensure that the slave process dies 
+    too. Avoids leaking gdm-simple-slave processes around.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 03 Oct 2010 10:19:10 +0200
 

Modified: desktop/unstable/gdm3/debian/patches/18_switch_kill_greeter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/18_switch_kill_greeter.patch?rev=25310&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/18_switch_kill_greeter.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/18_switch_kill_greeter.patch [utf-8] Tue Oct  5 21:13:31 2010
@@ -1,23 +1,15 @@
 Index: gdm-2.30.5/daemon/gdm-simple-slave.c
 ===================================================================
---- gdm-2.30.5.orig/daemon/gdm-simple-slave.c	2010-09-05 19:40:42.124367749 +0200
-+++ gdm-2.30.5/daemon/gdm-simple-slave.c	2010-09-05 19:42:38.676367792 +0200
-@@ -90,6 +90,7 @@ enum {
-         PROP_0,
- };
- 
-+static gboolean gdm_simple_slave_stop           (GdmSlave *slave);
- static void     gdm_simple_slave_class_init     (GdmSimpleSlaveClass *klass);
- static void     gdm_simple_slave_init           (GdmSimpleSlave      *simple_slave);
- static void     gdm_simple_slave_finalize       (GObject             *object);
-@@ -214,6 +215,23 @@ queue_greeter_reset (GdmSimpleSlave *sla
+--- gdm-2.30.5.orig/daemon/gdm-simple-slave.c	2010-10-05 20:16:52.931928245 +0200
++++ gdm-2.30.5/daemon/gdm-simple-slave.c	2010-10-05 22:47:00.375423640 +0200
+@@ -214,6 +214,23 @@ queue_greeter_reset (GdmSimpleSlave *sla
          slave->priv->greeter_reset_id = g_idle_add ((GSourceFunc)greeter_reset_timeout, slave);
  }
  
 +static gboolean
 +greeter_stop_timeout (GdmSimpleSlave *slave)
 +{
-+        gdm_simple_slave_stop (GDM_SLAVE (slave));
++        gdm_slave_stopped (GDM_SLAVE (slave));
 +        return FALSE;
 +}
 +
@@ -34,7 +26,7 @@
  static void
  on_session_setup_complete (GdmSession     *session,
                             GdmSimpleSlave *slave)
-@@ -387,7 +405,7 @@ start_session_timeout (GdmSimpleSlave *s
+@@ -387,7 +404,7 @@ start_session_timeout (GdmSimpleSlave *s
                     when Xorg exits it switches to the VT it was
                     started from.  That interferes with fast
                     user switching. */
@@ -43,7 +35,7 @@
  
                  goto out;
          }
-@@ -460,7 +478,7 @@ on_session_accreditation_failed (GdmSess
+@@ -460,7 +477,7 @@ on_session_accreditation_failed (GdmSess
             user switching. */
          destroy_session (slave);