From da569ea783bcbd3daa2d239d65833c3481203e9e Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Tue, 7 Sep 2004 05:22:50 +0000
Subject: (manage) clean interface kind assignment

---
 perl-install/standalone/drakconnect | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 51f1a8ab5..139b21052 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -204,11 +204,13 @@ sub manage {
     my %name = network::ethernet::get_eth_cards_names($modules_conf, @all_cards);
     foreach (keys %name) {
 	$p->{/eth|ath|wlan/ ? $name{$_} : $_} = { kind => $_ };
+	$p->{name}{intf} = $_;
     }
     while (my ($device, $interface) = each %$intf) {
         my $type;
         exists $name{$device} and next;
         $type = network::tools::get_interface_type($interface) and $p->{$type} = { kind => $device };
+        $p->{name}{intf} = $intf->{$device};
     }
 
     $window->{rwindow}->add(gtkpack_(Gtk2::VBox->new,
@@ -244,7 +246,7 @@ sub manage {
     each_index {
 	my ($name, $interface, $protocol) = ($_, $p->{$_}{kind}, $p->{$_}{protocol});
 	$p->{$name}{gui}{index} = $::i;
-	build_tree($netc, $p->{$name}{intf} = $intf->{$name =~ /eth|ath|wlan/ || !$name{$name} ? $interface : $name} || {}, $name, $interface, $protocol);
+	build_tree($netc, $p->{$name}{intf}, $name, $interface, $protocol);
 	build_notebook($netc, $p->{$name}{intf}, $p->{$name}{gui}, $apply_button, $name, $interface);
 	$notebook->append_page(gtkpack(Gtk2::VBox->new(0,0), $p->{$name}{gui}{notebook}));
     } (sort keys %$p);
-- 
cgit v1.2.1