summaryrefslogtreecommitdiffstats
path: root/lib/network
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-12-09 09:41:17 +0000
committerOlivier Blin <oblin@mandriva.com>2008-12-09 09:41:17 +0000
commit02f8eab9d55599fa3ac93962eaeb2b2aef3832cf (patch)
treebbd209dc77996c2d9d6392c07ad5a0776b3a1764 /lib/network
parent34fc705e3ae71bfb0b956e172804c8962e5487bb (diff)
downloaddrakx-net-02f8eab9d55599fa3ac93962eaeb2b2aef3832cf.tar
drakx-net-02f8eab9d55599fa3ac93962eaeb2b2aef3832cf.tar.gz
drakx-net-02f8eab9d55599fa3ac93962eaeb2b2aef3832cf.tar.bz2
drakx-net-02f8eab9d55599fa3ac93962eaeb2b2aef3832cf.tar.xz
drakx-net-02f8eab9d55599fa3ac93962eaeb2b2aef3832cf.zip
make connection managers use mandi when available
Diffstat (limited to 'lib/network')
-rw-r--r--lib/network/connection/wireless.pm4
-rw-r--r--lib/network/connection_manager.pm2
-rw-r--r--lib/network/netconnect.pm2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index ff48fb8..03fa9cc 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -355,9 +355,9 @@ sub load_interface_settings {
}
sub get_networks {
- my ($self) = @_;
+ my ($self, $o_net) = @_;
require network::monitor;
- ($self->{networks}, $self->{control}{roaming}) = network::monitor::list_wireless(undef, $self->get_interface);
+ ($self->{networks}, $self->{control}{roaming}) = network::monitor::list_wireless($o_net && $o_net->{monitor}, $self->get_interface);
$self->probed_networks;
$self->{networks};
}
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index 0ac2cda..a3cfe41 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -333,7 +333,7 @@ sub update_networks {
$cmanager->check_setup || $cmanager->setup_connection or return;
my $wait = $cmanager->{connection}->network_scan_is_slow && $cmanager->{in}->wait_message(N("Please wait"), N("Scanning for networks..."));
- $cmanager->{connection}{networks} = $cmanager->{connection}->get_networks;
+ $cmanager->{connection}{networks} = $cmanager->{connection}->get_networks($cmanager->{net});
$cmanager->{connection}{network} ||= find { $cmanager->{connection}{networks}{$_}{current} } keys %{$cmanager->{connection}{networks}};
my $routes = network::tools::get_routes();
diff --git a/lib/network/netconnect.pm b/lib/network/netconnect.pm
index 4ccd732..2759554 100644
--- a/lib/network/netconnect.pm
+++ b/lib/network/netconnect.pm
@@ -205,7 +205,7 @@ sub real_main {
select_network => {
pre => sub {
my $_w = $in->wait_message(N("Please wait"), N("Scanning for networks..."));
- $connection->get_networks;
+ $connection->get_networks($net);
},
name => sub { $net->{type}->get_type_name . "\n\n" . N("Please select your network:") },
data => sub {