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

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri May 7 19:44:16 UTC 2010


Author: joss
Date: Fri May  7 19:44:16 2010
New Revision: 24296

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24296
Log:
18_switch_kill_greeter.patch: new patch. Kill the greeter after 
switching to another user. Closes: #580630.

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

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=24296&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Fri May  7 19:44:16 2010
@@ -1,4 +1,4 @@
-gdm3 (2.30.2-2) UNRELEASED; urgency=low
+gdm3 (2.30.2-2) unstable; urgency=low
 
   * Pass X_PATH et al. through DEB_CONFIGURE_SCRIPT_ENV.
   * 16_xserver_path.patch: use the environment variables when they 
@@ -8,8 +8,10 @@
   * 17_no_libxdmcp.patch: fix build when there is no libxdmcp.
   * Updated Czech translation by Michal Šimůnek.
   * New Japanese translation by Hideki Yamane. Closes: #580222.
-
- -- Josselin Mouette <joss at debian.org>  Tue, 27 Apr 2010 21:26:58 +0200
+  * 18_switch_kill_greeter.patch: new patch. Kill the greeter after 
+    switching to another user. Closes: #580630.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 07 May 2010 21:42:02 +0200
 
 gdm3 (2.30.2-1) unstable; urgency=low
 

Added: 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=24296&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/18_switch_kill_greeter.patch (added)
+++ desktop/unstable/gdm3/debian/patches/18_switch_kill_greeter.patch [utf-8] Fri May  7 19:44:16 2010
@@ -1,0 +1,54 @@
+Index: gdm-2.30.2/daemon/gdm-simple-slave.c
+===================================================================
+--- gdm-2.30.2.orig/daemon/gdm-simple-slave.c	2010-05-07 21:02:21.096400430 +0200
++++ gdm-2.30.2/daemon/gdm-simple-slave.c	2010-05-07 21:24:37.872896540 +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);
+@@ -208,6 +209,23 @@ queue_greeter_reset (GdmSimpleSlave *sla
+         slave->priv->greeter_reset_id = g_timeout_add_seconds (2, (GSourceFunc)greeter_reset_timeout, slave);
+ }
+ 
++static gboolean
++greeter_stop_timeout (GdmSimpleSlave *slave)
++{
++        gdm_simple_slave_stop (GDM_SLAVE (slave));
++        return FALSE;
++}
++
++static void
++queue_greeter_stop (GdmSimpleSlave *slave)
++{
++        if (slave->priv->greeter_reset_id > 0) {
++                return;
++        }
++
++        slave->priv->greeter_reset_id = g_timeout_add_seconds (2, (GSourceFunc)greeter_stop_timeout, slave);
++}
++
+ static void
+ on_session_setup_complete (GdmSession     *session,
+                            GdmSimpleSlave *slave)
+@@ -380,7 +398,7 @@ start_session_timeout (GdmSimpleSlave *s
+                    when Xorg exits it switches to the VT it was
+                    started from.  That interferes with fast
+                    user switching. */
+-                queue_greeter_reset (slave);
++                queue_greeter_stop (slave);
+ 
+                 goto out;
+         }
+@@ -453,7 +471,7 @@ on_session_accreditation_failed (GdmSess
+            user switching. */
+         destroy_session (slave);
+ 
+-        queue_greeter_reset (slave);
++        queue_greeter_stop (slave);
+ }
+ 
+ static void

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=24296&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Fri May  7 19:44:16 2010
@@ -17,4 +17,5 @@
 15_kfreebsd.patch
 16_xserver_path.patch
 17_no_libxdmcp.patch
+18_switch_kill_greeter.patch
 90_relibtoolize.patch




More information about the pkg-gnome-commits mailing list