From 16d29a97063bbd928874697180ecbc27e2525199 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 14 Mar 2008 17:47:04 +0000
Subject: add set_connection wrapper

---
 lib/network/connection_manager.pm | 5 +++++
 lib/network/drakroam.pm           | 7 ++++---
 lib/network/netcenter.pm          | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index cb3f066..9d6145f 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -33,6 +33,11 @@ sub create {
     { in => $in, net => $net, gui => { w => $w, pixbufs => $pixbufs } };
 }
 
+sub set_connection {
+    my ($cmanager, $connection) = @_;
+    $cmanager->{connection} = $connection;
+}
+
 sub check_setup {
     my ($cmanager) = @_;
     $cmanager->{connection}{passed_setup} =
diff --git a/lib/network/drakroam.pm b/lib/network/drakroam.pm
index e308cf3..7d499c5 100755
--- a/lib/network/drakroam.pm
+++ b/lib/network/drakroam.pm
@@ -40,7 +40,7 @@ sub get_connection {
 sub select_connection {
     my ($droam) = @_;
 
-    $droam->{connection} = get_connection($droam);
+    network::connection_manager::set_connection($droam, get_connection($droam));
     network::connection_manager::check_setup($droam) || network::connection_manager::setup_connection($droam)
         if $droam->{connection};
     update_on_connection_change($droam);
@@ -142,8 +142,9 @@ sub main {
 
     my @connection_types = qw(network::connection::wireless network::connection::cellular_card);
     @{$droam->{all_connections}} = map { $_->get_connections(automatic_only => 1) } @connection_types;
-    $droam->{connection} = $o_interface && find { $_->get_interface eq $o_interface } @{$droam->{all_connections}};
-    $droam->{connection} ||= find { !$_->network_scan_is_slow } @{$droam->{all_connections}};
+    my $connection = $o_interface && find { $_->get_interface eq $o_interface } @{$droam->{all_connections}};
+    $connection ||= find { !$_->network_scan_is_slow } @{$droam->{all_connections}};
+    network::connection_manager::set_connection($droam, $connection) if $connection;
     update_connections_list($droam);
     update_on_connection_change($droam);
 
diff --git a/lib/network/netcenter.pm b/lib/network/netcenter.pm
index 6c53114..3c3f2b5 100755
--- a/lib/network/netcenter.pm
+++ b/lib/network/netcenter.pm
@@ -16,7 +16,7 @@ sub build_cmanager {
     my ($in, $net, $w, $pixbufs, $connection) = @_;
 
     my $cmanager = network::connection_manager::create($in, $net, $w, $pixbufs);
-    $cmanager->{connection} = $connection;
+    $cmanager->set_connection($connection);
 
     if ($connection->can('get_networks')) {
         network::connection_manager::create_networks_list($cmanager);
-- 
cgit v1.2.1