[gentoo-commits] gentoo-x86 commit in gnome-base/gdm/files: gdm-2.20.10-desktop-session-dmrc-autologin.patch

[Romain Perier (mrpouet)]

mrpouet     09/08/24 22:54:12

  Added:                gdm-2.20.10-desktop-session-dmrc-autologin.patch
  Log:
  Fix bug #281442, wrong DESKTOP_SESSION set if ${HOME}/.dmrc is empty and autologin enabled. Thanks to Fabio Erculiani <lxnay@××××××××××××.org> for this work. Clean up old revision
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch?rev=1.1&content-type=text/plain

Index: gdm-2.20.10-desktop-session-dmrc-autologin.patch
===================================================================
Author: Fabio Erculiani <lxnay@××××××××××××.org>
Date: Fri, 08 Aug 2009 09:19 +0000
Subject: Fix DESTOP_SESSION when dmrc is empty and autologin enabled.

---
 daemon/slave.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/daemon/slave.c b/daemon/slave.c
index b52774d..ced9567 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -4638,10 +4638,6 @@ gdm_slave_session_start (void)
 		language = g_strdup (usrlang);
 	}
 
-	tmp = gdm_strip_extension (session, ".desktop");
-	g_free (session);
-	session = tmp;
-
 	if (ve_string_empty (session)) {
 		g_free (session);
 		session = find_a_session ();
@@ -4651,6 +4647,10 @@ gdm_slave_session_start (void)
 		}
 	}
 
+	tmp = gdm_strip_extension (session, ".desktop");
+	g_free (session);
+	session = tmp;
+
 	if G_LIKELY (ve_string_empty (language)) {
 		g_free (language);
 		language = NULL;