From 3164a4636444b6c93716837abba868aefccc4a7b Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Sun, 18 May 2008 19:18:32 +0000 Subject: split configure_hardware out of check_hardware (for check_hardware to only probe hardware status in next commits) --- lib/network/connection_manager.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/network/connection_manager.pm') diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm index 09949d9..d6c93d9 100644 --- a/lib/network/connection_manager.pm +++ b/lib/network/connection_manager.pm @@ -66,7 +66,8 @@ sub setup_connection { $cmanager->{in}->ask_warn(N("Error"), $cmanager->{connection}{device}{error}); return; } - if ($cmanager->{connection}->can('get_hardware_settings')) { + my $device_ready = !$cmanager->{connection}->can('check_hardware') || $cmanager->{connection}->check_hardware; + if ($cmanager->{connection}->can('get_hardware_settings') && !$device_ready) { $cmanager->{connection}->guess_hardware_settings if $cmanager->{connection}->can('guess_hardware_settings'); $cmanager->{in}->ask_from_({ title => N("Network settings"), @@ -77,9 +78,9 @@ sub setup_connection { return; } } - if ($cmanager->{connection}->can('check_hardware')) { + if ($cmanager->{connection}->can('configure_hardware') && !$device_ready) { my $wait = $cmanager->{in}->wait_message(N("Please wait"), N("Configuring device...")); - if (!$cmanager->{connection}->check_hardware) { + if (!$cmanager->{connection}->configure_hardware) { undef $wait; $cmanager->{in}->ask_warn(N("Error"), $cmanager->{connection}{hardware}{error}) if $cmanager->{connection}{hardware}{error}; return; -- cgit v1.2.1