From d41efa4f9e4ac9198ae754d83e73a6e314518078 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 18 Mar 2008 10:31:33 +0000
Subject: - adduserdrake:   o display kdm/gdm icon again (was disabled on year
 ago)

---
 perl-install/NEWS         | 2 ++
 perl-install/any.pm       | 4 ++++
 perl-install/install/NEWS | 2 ++
 3 files changed, 8 insertions(+)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index db64fe4e5..322f08242 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- adduserdrake:
+  o display kdm/gdm icon again (was disabled on year ago)
 - do not write aliases for asus_acpi and thinkpad_acpi in
   modprobe.preload, the modules are now handled by coldplug
 - draksec
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ec5a93398..83bc734e1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -736,6 +736,7 @@ sub ask_user_and_root {
 
     $options{needauser} ||= $security >= 3;
 
+    my @icons = facesnames();
     my @suggested_names = $::isInstall ? do {
 	my @l = grep { !/^\./ && $_ ne 'lost+found' && -d "$::prefix/home/$_" } all("$::prefix/home");
 	grep { ! defined getpwnam($_) } @l;
@@ -797,6 +798,9 @@ sub ask_user_and_root {
           { label => N("Shell"), val => \$u->{shell}, list => [ shells() ], advanced => 1 },
 	  { label => N("User ID"), val => \$u->{uid}, advanced => 1, validate => sub { $validate_uid_gid->('uid') } },
 	  { label => N("Group ID"), val => \$u->{gid}, advanced => 1, validate => sub { $validate_uid_gid->('gid') } },
+           if_($security <= 3 && !$options{noicons} && @icons,
+	  { label => N("Icon"), val => \ ($u->{icon} ||= 'default'), list => \@icons, icon2f => \&face2png, format => \&translate },
+           ),
 	    if_($security > 3,
                 map {
                     { label => $_, val => \$groups{$_}, text => $high_security_groups{$_}, type => 'bool' };
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c6602d2b8..698d07f78 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- adduserdrake:
+  o display kdm/gdm icon again (was disabled on year ago)
 - do not write aliases for asus_acpi and thinkpad_acpi in
   modprobe.preload, the modules are now handled by coldplug
 
-- 
cgit v1.2.1