From dabe48195cab109ba9cb2bd179500ef481d53348 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 6 Jan 2001 17:07:15 +0000
Subject: ask_from_entries_refH parameter format has changed so change all
 accesses to it.

---
 perl-install/standalone/adduserdrake | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'perl-install/standalone/adduserdrake')

diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake
index c8fb8f2b6..18ee80c2b 100755
--- a/perl-install/standalone/adduserdrake
+++ b/perl-install/standalone/adduserdrake
@@ -36,15 +36,15 @@ if ($in->ask_from_entries_refH(
         [ _("Add user"), _("Accept user"), _("Done") ],
         _("Enter a user\n%s", $users ? _("(already added %s)", join(", ", map { $_->{realname} || $_->{name} } @users)) : ''),
         [ 
-	 _("Real name") => \$u->{realname},
-	 _("User name") => \$u->{name},
-	   $security < 2 ? () : (
-         _("Password") => {val => \$u->{password}, hidden => 1},
-         _("Password (again)") => {val => \$u->{password2}, hidden => 1},
-	   ), $::beginner ? () : (
-         _("Shell") => {val => \$u->{shell}, list => \@shells, not_edit => !$::expert} 
-	   ), $security > 3 ? () : (
-	 _("Icon") => {val => \$u->{icon}, list => [ any::facesnames() ], icon2f => \&any::face2xpm },
+	 { label => _("Real name"), val => \$u->{realname} },
+	 { label => _("User name"), val => \$u->{name} },
+	   if_($security >= 2,
+         { label => _("Password"), val => \$u->{password}, hidden => 1 },
+         { label => _("Password (again)"), val => \$u->{password2}, hidden => 1 },
+	   ), if_(!$::beginner,
+         { label => _("Shell"), val => \$u->{shell}, list => \@shells, not_edit => !$::expert } 
+	   ), if_($security <= 3,
+	 { label => _("Icon"), val => \$u->{icon}, list => [ any::facesnames() ], icon2f => \&any::face2xpm },
 	   ),
         ],
         focus_out => sub {
-- 
cgit v1.2.1