[gnome-control-center/wifi-refinements: 14/20] network: Make 'Connect to hidden' work again

[Matthias Clasen <matthiasc src gnome org>]

commit 4ccf4e2888e84a27cc42cfde52ca5597040f4698
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Sep 8 19:06:28 2012 -0400

    network: Make 'Connect to hidden' work again

 panels/network/net-device-wifi.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 37e429f..8641998 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -1067,12 +1067,6 @@ wireless_try_to_connect (NetDeviceWifi *device_wifi,
         g_debug ("try to connect to WIFI network %s [%s]",
                  ssid_target, ap_object_path);
 
-        /* hidden networks */
-        if (g_strcmp0 (ap_object_path, "ap-other...") == 0) {
-                connect_to_hidden_network (device_wifi);
-                goto out;
-        }
-
         /* look for an existing connection we can use */
         remote_settings = net_object_get_remote_settings (NET_OBJECT (device_wifi));
         list = nm_remote_settings_list_connections (remote_settings);
@@ -1616,7 +1610,9 @@ connect_wifi_network (NetDeviceWifi *device_wifi,
                             COLUMN_MODE, &mode,
                             -1);
 
-        if (connection_id)
+        if (g_strcmp0 (connection_id, "ap-other...") == 0)
+                connect_to_hidden_network (device_wifi);
+        else if (connection_id)
                 activate_connection (device_wifi, connection_id);
         else if (ap_in_range || mode == NM_802_11_MODE_UNKNOWN)
                 wireless_try_to_connect (device_wifi, ssid, ap_object_path);