r43853 - in /desktop/unstable/gdm3/debian: changelog patches/18_all_displays_transient.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Nov  9 18:54:17 2014
New Revision: 43853

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43853
Log:
18_all_displays_transient.patch: fix autologin for the initial 
display. Closes: #758183.

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

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=43853&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Sun Nov  9 18:54:17 2014
@@ -1,3 +1,10 @@
+gdm3 (3.14.1-3) unstable; urgency=medium
+
+  * 18_all_displays_transient.patch: fix autologin for the initial 
+    display. Closes: #758183.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 09 Nov 2014 18:16:02 +0100
+
 gdm3 (3.14.1-2) unstable; urgency=medium
 
   * Team upload.

Modified: desktop/unstable/gdm3/debian/patches/18_all_displays_transient.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/18_all_displays_transient.patch?rev=43853&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/18_all_displays_transient.patch	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/18_all_displays_transient.patch	[utf-8] Sun Nov  9 18:54:17 2014
@@ -2,10 +2,10 @@
 By default, they are not reaped at the end of the session and go back to 
 the login prompt.
 
-Index: gdm3-3.12.2/daemon/Makefile.am
+Index: gdm3-3.14.1/daemon/Makefile.am
 ===================================================================
---- gdm3-3.12.2.orig/daemon/Makefile.am	2014-05-13 20:33:05.000000000 +0200
-+++ gdm3-3.12.2/daemon/Makefile.am	2014-08-14 01:11:28.000000000 +0200
+--- gdm3-3.14.1.orig/daemon/Makefile.am	2014-11-09 18:30:31.474923397 +0100
++++ gdm3-3.14.1/daemon/Makefile.am	2014-11-09 18:30:31.470923456 +0100
 @@ -35,7 +35,6 @@ AM_CPPFLAGS = \
  BUILT_SOURCES =					\
  	gdm-display-glue.h			\
@@ -62,10 +62,10 @@
  	gdm-transient-display.xml	\
  	gdm-local-display-factory.xml	\
  	gdm-session-enum-types.c.in	\
-Index: gdm3-3.12.2/daemon/gdm-local-display-factory.c
+Index: gdm3-3.14.1/daemon/gdm-local-display-factory.c
 ===================================================================
---- gdm3-3.12.2.orig/daemon/gdm-local-display-factory.c	2014-03-18 05:23:44.000000000 +0100
-+++ gdm3-3.12.2/daemon/gdm-local-display-factory.c	2014-08-14 01:11:28.000000000 +0200
+--- gdm3-3.14.1.orig/daemon/gdm-local-display-factory.c	2014-11-09 18:30:31.474923397 +0100
++++ gdm3-3.14.1/daemon/gdm-local-display-factory.c	2014-11-09 18:30:31.474923397 +0100
 @@ -35,7 +35,6 @@
  #include "gdm-local-display-factory-glue.h"
  
@@ -105,10 +105,10 @@
  
          g_object_set (display, "seat-id", seat_id, NULL);
          g_object_set (display, "is-initial", initial, NULL);
-Index: gdm3-3.12.2/daemon/gdm-transient-display.c
+Index: gdm3-3.14.1/daemon/gdm-transient-display.c
 ===================================================================
---- gdm3-3.12.2.orig/daemon/gdm-transient-display.c	2014-08-14 01:11:28.000000000 +0200
-+++ gdm3-3.12.2/daemon/gdm-transient-display.c	2014-08-14 01:13:50.867144257 +0200
+--- gdm3-3.14.1.orig/daemon/gdm-transient-display.c	2014-11-09 18:30:31.474923397 +0100
++++ gdm3-3.14.1/daemon/gdm-transient-display.c	2014-11-09 18:31:03.034454271 +0100
 @@ -94,9 +94,22 @@ gdm_transient_display_manage (GdmDisplay
  static gboolean
  gdm_transient_display_finish (GdmDisplay *display)
@@ -133,3 +133,23 @@
  
          return TRUE;
  }
+@@ -117,9 +130,16 @@ gdm_transient_display_get_timed_login_de
+                                                char      **usernamep,
+                                                int        *delayp)
+ {
+-        *enabledp = FALSE;
+-        *usernamep = g_strdup ("");
+-        *delayp = 0;
++        gboolean is_initial = FALSE;
++        gdm_display_is_initial (display, &is_initial, NULL);
++
++        if (is_initial) {
++                GDM_DISPLAY_CLASS (gdm_transient_display_parent_class)->get_timed_login_details (display, enabledp, usernamep, delayp);
++        } else {
++                *enabledp = FALSE;
++                *usernamep = g_strdup ("");
++                *delayp = 0;
++        }
+ }
+ 
+ static GObject *