From b2dcc1f05939631e7583740a36f3c41c87235639 Mon Sep 17 00:00:00 2001
From: pad <pad@mandriva.com>
Date: Sun, 5 Sep 1999 13:59:16 +0000
Subject: clean graphical to use ask_from_entries

---
 perl-install/interactive.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'perl-install/interactive.pm')

diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index de9998145..dc846f42b 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -105,7 +105,14 @@ sub ask_from_entries_ref($$$$;$%) {
     my ($o, $title, $message, $l, $val, %callback) = @_;
     
     $message = ref $message ? $message : [ $message ];
-    my $val_hash = [ map { (ref $_) eq "SCALAR" ? { val => $_ } : {(%{$_}, type => "list")}} @{$val} ];
+    my $val_hash = [ map 
+		     { if ((ref $_) eq "SCALAR") {
+			 { val => $_ }
+		     } else {
+			 @{$_->{list}} ?
+			   { (%{$_}, type => "list")} : {(%{$_})}
+		       }
+		   } @{$val} ];
 
     $o->ask_from_entries_refW($title, $message, $l, $val_hash, %callback)
     
-- 
cgit v1.2.1