- move radio buttons to $gui->{intf_radio}

- fix authentication menu wrongly used for isdn

1 files changed, 8 insertions, 7 deletions

diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 5af5bb683..6f181c479 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -396,10 +396,10 @@ sub build_notebook {
 				      ),
 			     ),
 			 ));
-	$dialing_mode_radio[0]->signal_connect('toggled' => sub { $gui->{intf}{dialing_mode} = 'auto'; $apply->() });
-	$dialing_mode_radio[1]->signal_connect('toggled' => sub { $gui->{intf}{dialing_mode} = 'static'; $apply->() });
-	$speed_radio[0]->signal_connect('toggled' => sub { $gui->{intf}{speed} = '64'; $apply->() });
-	$speed_radio[1]->signal_connect('toggled' => sub { $gui->{intf}{speed} = '128'; $apply->() });
+	$dialing_mode_radio[0]->signal_connect('toggled' => sub { $gui->{intf_radio}{dialing_mode} = 'auto'; $apply->() });
+	$dialing_mode_radio[1]->signal_connect('toggled' => sub { $gui->{intf_radio}{dialing_mode} = 'static'; $apply->() });
+	$speed_radio[0]->signal_connect('toggled' => sub { $gui->{intf_radio}{speed} = '64'; $apply->() });
+	$speed_radio[1]->signal_connect('toggled' => sub { $gui->{intf_radio}{speed} = '128'; $apply->() });
 	$gui->{intf_bool}{ONBOOT}->set_active($intf->{ONBOOT} eq 'yes' ? 1 : 0);
 	$gui->{intf_bool}{MII_NOT_SUPPORTED}->set_active($intf->{MII_NOT_SUPPORTED} eq 'no' ? 1 : 0);
 	$gui->{intf_bool}{HWADDR}->set_active($intf->{HWADDR});
@@ -410,7 +410,7 @@ sub build_notebook {
 	    $gui->{description} = $interface_kind eq 'speedtouch' ? 'Alcatel|USB ADSL Modem (Speed Touch)' : 'Analog Devices Inc.|USB ADSL modem';
 	}
 	gtkpack_($gui->{sheet}{N("Account")} = Gtk2::VBox->new(0,0),
-		 if_($interface eq 'isdn',
+		 if_($interface eq 'modem',
 		     0, gtkpack_(Gtk2::VBox->new(0,0),
 				 1, Gtk2::Label->new(N("Authentication")),
 				 0, $gui->{intf}{auth} = gtksignal_connect(Gtk2::OptionMenu->new,
@@ -453,8 +453,8 @@ sub build_notebook {
 							N("Protocol for the rest of the world\nNo D-Channel (leased lines)")),
 			 ),
 	       );
-	$protocol_radio[0]->signal_connect('toggled' => sub { $gui->{isdn}{protocol} = 2; $apply });
-	$protocol_radio[1]->signal_connect('toggled' => sub { $gui->{isdn}{protocol} = 3; $apply });
+	$protocol_radio[0]->signal_connect('toggled' => sub { $gui->{intf_radio}{protocol} = 2; $apply->() });
+	$protocol_radio[1]->signal_connect('toggled' => sub { $gui->{intf_radio}{protocol} = 3; $apply->() });
     }
     
     if ($intf->{pages}{N("Informations")}) {
@@ -504,6 +504,7 @@ sub save_notebook {
     
     $netc->{$_} = $gui->{netc}{$_}->get_text foreach keys %{$gui->{netc}};
     $gui->{intf}{$_} and $intf->{$_} = $gui->{intf}{$_}->get_text foreach keys %{$gui->{intf}};
+    $gui->{intf_radio}{$_} and $intf->{$_} = $gui->{intf_radio}{$_} foreach keys %{$gui->{intf_radio}};
     $intf->{$_} = bool2yesno($gui->{intf_bool}{$_}->get_active) foreach keys %{$gui->{intf_bool}};
     $gui->{intf_bool}{MII_NOT_SUPPORTED} and $intf->{MII_NOT_SUPPORTED} = bool2yesno(!$gui->{intf_bool}{MII_NOT_SUPPORTED}->get_active);
     $gui->{intf_bool}{HWADDR} and (bool2yesno($gui->{intf_bool}{HWADDR}->get_active) eq 'yes' ? ($intf->{HWADDR} = 'yes') : delete $intf->{HWADDR});