From fdd57f52cc1beda869eb5488a53b8cbb0a93bed6 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 20 Feb 2008 17:16:00 +0000
Subject: allow to configure device if not installed (#33531)

---
 lib/network/connection_manager.pm | 22 +++++++++++++++++++---
 1 file changed, 19 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 89a831f..c8e8b74 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -61,6 +61,7 @@ sub setup_connection {
             return;
         }
     }
+    $cmanager->{connection}{passed_setup} = 1;
 }
 
 sub load_settings {
@@ -79,6 +80,12 @@ sub load_settings {
 sub configure_connection {
     my ($cmanager) = @_;
 
+    if (!$cmanager->{connection}{passed_setup}) {
+        setup_connection($cmanager);
+        update_on_status_change($cmanager);
+        return;
+    }
+
     load_settings($cmanager);
 
     my $error;
@@ -294,9 +301,18 @@ sub update_on_status_change {
     $cmanager->{gui}{buttons}{connect_stop}->set_sensitive($cmanager->{connection} && $cmanager->{connection}->get_status)
       if $cmanager->{gui}{buttons}{connect_stop};
 
-    my $may_have_network = $cmanager->{connection} &&
-      (!$cmanager->{connection}->can('get_networks') || $cmanager->{connection}{network});
-    $cmanager->{gui}{buttons}{configure}->set_sensitive($may_have_network)
+    my $allow_configure;
+    if ($cmanager->{connection}) {
+        my $may_have_network =
+          !$cmanager->{connection}->can('get_networks') ||
+          $cmanager->{connection}{network};
+        $cmanager->{connection}{passed_setup} =
+          !$cmanager->{connection}->can("check_device") ||
+          $cmanager->{connection}->check_device;
+        $allow_configure = $may_have_network || !$cmanager->{connection}{passed_setup};
+    }
+
+    $cmanager->{gui}{buttons}{configure}->set_sensitive($allow_configure)
       if $cmanager->{gui}{buttons}{configure};
 
     my $has_interface = to_bool($cmanager->{connection} && $cmanager->{connection}->get_interface);
-- 
cgit v1.2.1