diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-05-26 12:47:56 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-05-26 12:47:56 +0000 |
| commit | 501bcb87703f3fdc7a85172e923cf4da1aabec3d (patch) | |
| tree | 8b367964c30518d2d71bddc4fdf936f5cc55db56 | |
| parent | da7e960a0616964eb6d08e0588dfea4ac196af38 (diff) | |
| download | drakx-net-501bcb87703f3fdc7a85172e923cf4da1aabec3d.tar drakx-net-501bcb87703f3fdc7a85172e923cf4da1aabec3d.tar.gz drakx-net-501bcb87703f3fdc7a85172e923cf4da1aabec3d.tar.bz2 drakx-net-501bcb87703f3fdc7a85172e923cf4da1aabec3d.tar.xz drakx-net-501bcb87703f3fdc7a85172e923cf4da1aabec3d.zip | |
reload provider settings only when apply provider settings
| -rw-r--r-- | lib/network/connection.pm | 2 | ||||
| -rw-r--r-- | 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); } |