Attachment 9024 Details for Bug 19234 – Correctly leave Session empty in sddm.conf if no desktop is selected

[patch] Correctly leave Session empty in sddm.conf if no desktop is selected

drakx-fix-autologin.diff (text/plain), 806 bytes, created by Frédéric "LpSolit" Buclin on 2017-03-06 00:39:47 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric "LpSolit" Buclin

Created: 2017-03-06 00:39:47 CET

Size: 806 bytes

patch

obsolete

From a148b97d244fb9fa9caec20ce4a86326732d6aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@netscape.net>
Date: Mon, 6 Mar 2017 00:31:55 +0100
Subject: [PATCH] Make sure to leave Session empty in sddm.conf if no desktop
 is selected (mga#19234)

---
 perl-install/any.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-install/any.pm b/perl-install/any.pm
index db190f1..75dd722 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -675,7 +675,7 @@ sub adapt_desktop_for_plasma {
 	'Plasma' => '01plasma',
 	'GNOMEClassic' => 'gnome-classic',
     );
-    $h{$desktop} ? $h{$desktop} . '.desktop' : lc("${desktop}.desktop");
+    return $desktop ? ($h{$desktop} || lc($desktop)) . '.desktop' : '';
 }
 
 sub get_autologin() {
-- 
2.10.2

Actions: View | Diff

Attachments on bug 19234: 9024