From c79716cab690e596f9371416b20702c30414b22e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 29 Mar 2001 16:27:40 +0000
Subject: (chooseGroups): simplified, more complex version in install_steps_gtk
 (configurePrinter): fix the inverted condition for installing xpp/kups

---
 perl-install/install_steps_interactive.pm | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

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

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a71745704..b82463dd4 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -591,18 +591,13 @@ sub reallyChooseGroups {
 				 $path = $o->{compssUsers}{$_}{path};
 				 if_($old ne $path, { val => $path }),
 				 {
-			     help => translate($o->{compssUsers}{$_}{descr}),
-			     val => \$val->{$_},
-			     type => 'bool',
-			     icon => do {
-				 my $f = "/usr/share/icons/" . ($o->{compssUsers}{$_}{icons} || 'default');
-				 -e "$f.png" or $f .= "_section";
-				 -e "$f.png" or $f = '/usr/share/icons/default_section';
-				 "$f.png";
-			     },
-			     disabled => sub { $all },
-			     text => translate($o->{compssUsers}{$_}{label}),# . sprintf(" (%d%s)", $compute_size->(@{$compssUsers->{$_}{flags}}) / sqr(1024), _("MB")),
-			   } } @{$o->{compssUsersSorted}}),
+				  val => \$val->{$_},
+				  type => 'bool',
+				  disabled => sub { $all },
+				  text => translate($o->{compssUsers}{$_}{label}),
+				  help => translate($o->{compssUsers}{$_}{descr}),
+				 }
+			     } @{$o->{compssUsersSorted}}),
 			   if_($o->{meta_class} eq 'desktop', { text => _("All"), val => \$all, type => 'bool' }),
 			   if_($individual, { text => _("Individual package selection"), val => $individual, advanced => 1, type => 'bool' }),
 			  ], changed => sub { $size_text = &$size_to_display }) or return;
@@ -848,7 +843,7 @@ sub configurePrinter {
     $printer->{PAPERSIZE} = $o->{lang} eq 'en' ? 'letter' : 'a4';
     printerdrake::main($printer, $o, sub { $o->pkg_install(@_) }, sub { install_interactive::upNetwork($o, 'pppAvoided') });
 
-    $o->pkg_install_if_requires_satisfied('Mesa-common', 'xpp', 'libqtcups2', 'qtcups', 'kups') if %{$printer->{configured} || {}} == ();
+    $o->pkg_install_if_requires_satisfied('Mesa-common', 'xpp', 'libqtcups2', 'qtcups', 'kups') if !is_empty_hash_ref($printer->{configured});
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1