r24315 - in /desktop/unstable/gdm3/debian: changelog patches/22_noconsole.patch patches/23_autologin_once.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat May 8 12:59:12 UTC 2010


Author: joss
Date: Sat May  8 12:59:11 2010
New Revision: 24315

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24315
Log:
23_autologin_once.patch: patch from Vincent Untz. Do not autologin 
again after the session has been closed. Closes: #578736.

Added:
    desktop/unstable/gdm3/debian/patches/23_autologin_once.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/22_noconsole.patch
    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=24315&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sat May  8 12:59:11 2010
@@ -1,4 +1,4 @@
-gdm3 (2.30.2-3) UNRELEASED; urgency=low
+gdm3 (2.30.2-3) unstable; urgency=low
 
   * Pass -novtswitch to the X server options, so that it doesn’t switch 
     back to the original tty when being killed. This fixes a corner case 
@@ -21,8 +21,10 @@
   * 90_relibtoolize.patch: refreshed accordingly.
   * 22_noconsole.patch: patch from Patrick Monnerat to allow GDM to work 
     as a standalone XDMCP server.
-
- -- Josselin Mouette <joss at debian.org>  Sat, 08 May 2010 10:24:52 +0200
+  * 23_autologin_once.patch: patch from Vincent Untz. Do not autologin 
+    again after the session has been closed. Closes: #578736.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 08 May 2010 14:59:06 +0200
 
 gdm3 (2.30.2-2) unstable; urgency=low
 

Modified: desktop/unstable/gdm3/debian/patches/22_noconsole.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/22_noconsole.patch?rev=24315&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/22_noconsole.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/22_noconsole.patch [utf-8] Sat May  8 12:59:11 2010
@@ -2,20 +2,20 @@
 
 Index: gdm-2.30.2/common/gdm-settings-keys.h
 ===================================================================
---- gdm-2.30.2.orig/common/gdm-settings-keys.h	2010-05-08 10:32:52.000000000 +0200
-+++ gdm-2.30.2/common/gdm-settings-keys.h	2010-05-08 14:38:59.321611630 +0200
+--- gdm-2.30.2.orig/common/gdm-settings-keys.h	2010-05-08 14:49:12.457112035 +0200
++++ gdm-2.30.2/common/gdm-settings-keys.h	2010-05-08 14:57:27.285109455 +0200
 @@ -32,6 +32,7 @@ G_BEGIN_DECLS
  #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
  #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
  #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
 +#define GDM_KEY_NO_CONSOLE "daemon/NoConsole"
  #define GDM_KEY_FIRST_VT "daemon/FirstVT"
+ #define GDM_KEY_LOCAL_XSERVER_COMMAND "daemon/LocalXserverCommand"
  
- #define GDM_KEY_DEBUG "debug/Enable"
 Index: gdm-2.30.2/daemon/gdm-manager.c
 ===================================================================
---- gdm-2.30.2.orig/daemon/gdm-manager.c	2010-05-08 14:30:39.000000000 +0200
-+++ gdm-2.30.2/daemon/gdm-manager.c	2010-05-08 14:38:13.725613897 +0200
+--- gdm-2.30.2.orig/daemon/gdm-manager.c	2010-05-08 14:46:42.981612567 +0200
++++ gdm-2.30.2/daemon/gdm-manager.c	2010-05-08 14:57:27.285109455 +0200
 @@ -71,7 +71,8 @@ struct GdmManagerPrivate
  
  enum {
@@ -83,8 +83,8 @@
                  break;
 Index: gdm-2.30.2/daemon/gdm-manager.h
 ===================================================================
---- gdm-2.30.2.orig/daemon/gdm-manager.h	2010-03-17 22:27:16.000000000 +0100
-+++ gdm-2.30.2/daemon/gdm-manager.h	2010-05-08 14:38:13.729611542 +0200
+--- gdm-2.30.2.orig/daemon/gdm-manager.h	2010-05-08 14:46:42.969610832 +0200
++++ gdm-2.30.2/daemon/gdm-manager.h	2010-05-08 14:57:27.285109455 +0200
 @@ -69,6 +69,8 @@ void                gdm_manager_set_wait
  
  void                gdm_manager_set_xdmcp_enabled              (GdmManager *manager,
@@ -96,8 +96,8 @@
                                                                  GError    **error);
 Index: gdm-2.30.2/daemon/main.c
 ===================================================================
---- gdm-2.30.2.orig/daemon/main.c	2010-05-08 14:30:41.000000000 +0200
-+++ gdm-2.30.2/daemon/main.c	2010-05-08 14:38:13.729611542 +0200
+--- gdm-2.30.2.orig/daemon/main.c	2010-05-08 14:57:26.257612530 +0200
++++ gdm-2.30.2/daemon/main.c	2010-05-08 14:57:27.285109455 +0200
 @@ -525,6 +525,7 @@ main (int    argc,
          int                 ret;
          gboolean            res;
@@ -119,9 +119,9 @@
          gdm_manager_set_xdmcp_enabled (manager, xdmcp_enabled);
 Index: gdm-2.30.2/data/gdm.schemas.in.in
 ===================================================================
---- gdm-2.30.2.orig/data/gdm.schemas.in.in	2010-05-08 10:32:52.000000000 +0200
-+++ gdm-2.30.2/data/gdm.schemas.in.in	2010-05-08 14:38:13.729611542 +0200
-@@ -52,6 +52,11 @@
+--- gdm-2.30.2.orig/data/gdm.schemas.in.in	2010-05-08 14:50:42.425611096 +0200
++++ gdm-2.30.2/data/gdm.schemas.in.in	2010-05-08 14:57:27.289111012 +0200
+@@ -57,6 +57,11 @@
        <signature>i</signature>
        <default>7</default>
      </schema>

Added: desktop/unstable/gdm3/debian/patches/23_autologin_once.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/23_autologin_once.patch?rev=24315&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/23_autologin_once.patch (added)
+++ desktop/unstable/gdm3/debian/patches/23_autologin_once.patch [utf-8] Sat May  8 12:59:11 2010
@@ -1,0 +1,66 @@
+From 84b56bed7308ecbb236e6d002b8358bfd0156bc0 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Fri, 2 Oct 2009 00:53:04 +0200
+Subject: [PATCH] Do not autologin again after a logout
+
+Note that it doesn't affect timed login at all.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=587606
+---
+ daemon/gdm-static-display.c |   20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/daemon/gdm-static-display.c b/daemon/gdm-static-display.c
+index a747ee3..9605f5a 100644
+--- a/daemon/gdm-static-display.c
++++ b/daemon/gdm-static-display.c
+@@ -45,7 +45,7 @@
+ 
+ struct GdmStaticDisplayPrivate
+ {
+-        gboolean enable_timed_login;
++        gboolean first_login;
+ };
+ 
+ enum {
+@@ -121,6 +121,8 @@ gdm_static_display_unmanage (GdmDisplay *display)
+ {
+         g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
+ 
++        GDM_STATIC_DISPLAY (display)->priv->first_login = FALSE;
++
+         GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->unmanage (display);
+ 
+         return TRUE;
+@@ -158,12 +160,14 @@ gdm_static_display_get_timed_login_details (GdmDisplay *display,
+                                             char      **usernamep,
+                                             int        *delayp)
+ {
+-        if (GDM_STATIC_DISPLAY (display)->priv->enable_timed_login) {
+-                GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp);
+-        } else {
+-                *enabledp = FALSE;
+-                *usernamep = g_strdup ("");
+-                *delayp = 0;
++        GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp);
++
++        if (!GDM_STATIC_DISPLAY (display)->priv->first_login) {
++                /* if this is autologin but not timed login, then disable
++                 * autologin after the first one */
++                if (*enabledp && *delayp == 0) {
++                        *enabledp = FALSE;
++                }
+         }
+ }
+ 
+@@ -196,7 +200,7 @@ gdm_static_display_init (GdmStaticDisplay *static_display)
+ 
+         static_display->priv = GDM_STATIC_DISPLAY_GET_PRIVATE (static_display);
+ 
+-        static_display->priv->enable_timed_login = TRUE;
++        static_display->priv->first_login = TRUE;
+ }
+ 
+ static void
+-- 
+1.6.4.2

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=24315&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sat May  8 12:59:11 2010
@@ -22,4 +22,5 @@
 20_endsession_respawn.patch
 21_schemas_usr.patch
 22_noconsole.patch
+23_autologin_once.patch
 90_relibtoolize.patch




More information about the pkg-gnome-commits mailing list