From 7b2305eddadc40833bc7765a47b1753efe09cbae Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 4 Jul 2008 13:39:29 +0000
Subject: detect KDE4 when configuring autologin

---
 perl-install/NEWS             | 2 ++
 perl-install/any.pm           | 7 ++++---
 perl-install/install/NEWS     | 2 ++
 perl-install/install/steps.pm | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2df15898c..da9e69d9d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- detect KDE4 when configuring autologin
+
 Version 10.39 - 25 June 2008
 
 - bootloader-config:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 1d50f6a84..8b21db944 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -638,7 +638,7 @@ sub set_autologin {
     )) };
   
     my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin";
-    if (member($o_wm, 'KDE', 'GNOME')) {
+    if (member($o_wm, 'KDE', 'KDE4', 'GNOME')) {
 	unlink $xdm_autologin_cfg;
     } else {
 	$do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin') if $o_user;
@@ -837,8 +837,9 @@ sub autologin {
     my @wm = sessions();
     my @users = map { $_->{name} } @{$o->{users} || []};
 
-    if (member('KDE', @wm) && @users == 1 && $o->{meta_class} eq 'desktop') {
-	$o->{desktop} = 'KDE';
+    my $kde_desktop = find { member($_, 'KDE', 'KDE4') } @wm;
+    if ($kde_desktop && @users == 1 && $o->{meta_class} eq 'desktop') {
+	$o->{desktop} = $kde_desktop;
 	$o->{autologin} = $users[0];
     } elsif (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
 	my $use_autologin = @users == 1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index eed4647ac..f32ee7467 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- detect KDE4 when configuring autologin
+
 Version 10.42 - 26 June 2008
 
 - fix reading rpm macros from /etc/macros.d/ (esp. %_filetriggers_dir)
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 555fc9254..ac7566755 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -755,7 +755,7 @@ sub addUser {
 
     if ($o->{autologin}) {
 	$o->{desktop} ||= first(any::sessions());
-	$o->pkg_install("autologin") if !member($o->{desktop}, 'KDE', 'GNOME');
+	$o->pkg_install("autologin") if !member($o->{desktop}, 'KDE', 'KDE4', 'GNOME');
     }
     any::set_autologin($o->do_pkgs, $o->{autologin}, $o->{desktop});
 
-- 
cgit v1.2.1