From 12903bc3c97a7e39a130ffc9b07631186fb7c9ba Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Mon, 15 Dec 2008 11:59:08 +0000
Subject: keep wireless wait messages while wpa_supplicant is associating

---
 lib/network/connection_manager.pm |  6 +++++-
 lib/network/netcenter.pm          | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'lib/network')

diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index a3cfe41..05f345e 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -199,7 +199,7 @@ sub start_connection {
     }
 
     gtkset_mousecursor_wait($cmanager->{gui}{w}{window}->window);
-    my $_wait = $cmanager->{in}->wait_message(N("Please wait"), N("Connecting..."));
+    my $wait = $cmanager->{in}->wait_message(N("Please wait"), N("Connecting..."));
     if ($cmanager->{connection}->can('apply_network_selection')) {
         $cmanager->load_settings;
         $cmanager->{connection}->apply_network_selection($cmanager);
@@ -210,6 +210,10 @@ sub start_connection {
     gtkset_mousecursor_normal($cmanager->{gui}{w}{window}->window);
 
     $cmanager->update_on_status_change;
+    if ($cmanager->{wait_message_timeout}) {
+        $cmanager->{wait_message} = $wait;
+        Glib::Timeout->add($cmanager->{wait_message_timeout}, sub { undef $cmanager->{wait_message} });
+    };
 }
 
 sub stop_connection {
diff --git a/lib/network/netcenter.pm b/lib/network/netcenter.pm
index 5e170d9..a43c52a 100755
--- a/lib/network/netcenter.pm
+++ b/lib/network/netcenter.pm
@@ -18,6 +18,7 @@ sub build_cmanager {
     my $cmanager = network::connection_manager->new($in, $net, $w, $pixbufs);
     $cmanager->set_connection($connection);
     $cmanager->{gui}{show_unique_network} = $cmanager->{connection}->has_unique_network;
+    $cmanager->{wait_message_timeout} = 20*1000 if ref($connection) eq 'network::connection::wireless' && $net->{monitor};
 
     if ($connection->can('get_networks')) {
         $cmanager->create_networks_list;
@@ -198,6 +199,15 @@ sub main {
             if ($msg->get_interface eq 'com.mandriva.monitoring.wireless' && $msg->get_member eq 'Event') {
                 my ($event, $interface) = $msg->get_args_list;
                 print "got wireless event: $event $interface\n";
+                my $cmanager = find { $_->{connection}->get_interface eq $interface } @cmanagers;
+                if ($cmanager && $cmanager->{wait_message}) {
+                    if ($event =~ /CTRL-EVENT-CONNECTED/) {
+                        undef $cmanager->{wait_message};
+                    } elsif ($event =~ /Authentication with (.+?) timed out/) {
+                        undef $cmanager->{wait_message};
+                        $cmanager->{in}->ask_warn(N("Error"), N("Connection failed."));
+                    }
+                }
             }
         });
         $dbus->{connection}->add_match("type='signal',interface='com.mandriva.network'");
-- 
cgit v1.2.1