From 5199c4e9d1d1a7b6d22d4c94e664b20318bbdb4b Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Wed, 20 Jul 2005 06:27:13 +0000
Subject: get network ids and current network

---
 perl-install/network/monitor.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/perl-install/network/monitor.pm b/perl-install/network/monitor.pm
index 1372baa6b..beead7ee5 100644
--- a/perl-install/network/monitor.pm
+++ b/perl-install/network/monitor.pm
@@ -1,5 +1,6 @@
 package network::monitor;
 
+use common;
 use dbus_object;
 
 our @ISA = qw(dbus_object);
@@ -16,11 +17,18 @@ sub new {
 sub list_wireless {
     my ($o) = @_;
     my $networks;
-    eval { $networks = $o->call_method('ListWireless') };
+    eval { $networks = $o->call_method('ScanResults') };
     my %networks;
     while ($networks =~ /^((?:[0-9a-f]{2}:){5}[0-9a-f]{2})\t(\d+)\t(\d+)\t(.*?)\t(.*)$/mg) {
         $networks{$1} = { frequency => $2, signal_level => $3, flags => $4, ssid => $5 };
     }
+    eval { $networks = $o->call_method('ListNetworks') };
+    while ($networks =~ /^(\d+)\t(.*?)\t(.*?)\t(.*)$/mg) {
+        if (my $net = $networks{$3} || find { $_->{ssid} eq $2 } values(%networks)) {
+            $net->{id} = $1;
+            $net->{current} = to_bool($4 eq '[CURRENT]');
+        }
+    }
     \%networks;
 }
 
-- 
cgit v1.2.1