[gnome-control-center] network: Further refinements to out-of-range avoidance

[Bastien Nocera <hadess src gnome org>]

commit 42d835b3ce92188fc9f01d0461b53b6f44f67160
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Oct 2 15:11:59 2012 +0200

    network: Further refinements to out-of-range avoidance

 panels/network/net-device-wifi.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index fec731d..6a7d61e 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -1692,12 +1692,16 @@ connect_wifi_network (NetDeviceWifi *device_wifi,
                             COLUMN_AP_IN_RANGE, &ap_in_range,
                             COLUMN_MODE, &mode,
                             -1);
-        if (g_strcmp0 (connection_id, "ap-other...") == 0)
+        if (g_strcmp0 (connection_id, "ap-other...") == 0) {
                 connect_to_hidden_network (device_wifi);
-        else if (ap_in_range)
-                wireless_try_to_connect (device_wifi, ssid, ap_object_path);
-        else
+        } else if (ap_in_range) {
+                if (connection_id)
+                        activate_connection (device_wifi, connection_id);
+                else
+                        wireless_try_to_connect (device_wifi, ssid, ap_object_path);
+        } else {
                 g_warning ("can't connect");
+        }
 
         g_free (ap_object_path);
         g_free (connection_id);