From 501bcb87703f3fdc7a85172e923cf4da1aabec3d Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 26 May 2008 12:47:56 +0000
Subject: reload provider settings only when apply provider settings

---
 lib/network/connection.pm          | 2 +-
 lib/network/connection/cellular.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/network/connection.pm b/lib/network/connection.pm
index dccbefe..7b13396 100644
--- a/lib/network/connection.pm
+++ b/lib/network/connection.pm
@@ -179,7 +179,7 @@ sub set_provider {
 sub apply_provider_settings {
     my ($self, $net) = @_;
     $self->guess_protocol($net) if $self->can('guess_protocol');
-    $self->guess_access_settings if $self->can('guess_access_settings');
+    $self->guess_access_settings('provider_only') if $self->can('guess_access_settings');
 }
 
 #- check that $self->can('get_providers') first
diff --git a/lib/network/connection/cellular.pm b/lib/network/connection/cellular.pm
index 11e6be1..71509c4 100644
--- a/lib/network/connection/cellular.pm
+++ b/lib/network/connection/cellular.pm
@@ -55,8 +55,8 @@ sub guess_provider_settings {
 }
 
 sub guess_access_settings {
-    my ($self) = @_;
-    my $settings = $self->load_cellular_settings || {};
+    my ($self, $o_provider_only) = @_;
+    my $settings = !$o_provider_only && $self->load_cellular_settings || {};
     $self->{access}{$_} = $settings->{uc($_)} || $self->{provider}{$_} foreach qw(login password apn);
 }
 
-- 
cgit v1.2.1