NetworkManager r3236 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Jan 11 22:09:21 2008
New Revision: 3236
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3236&view=rev

Log:
2008-01-12  Dan Williams  <dcbw redhat com>

	* src/nm-device-802-11-wireless.c
		- (activation_success_handler): if a match was found in the scan list
			and that match is a hidden AP, update that AP's SSID



Modified:
   trunk/ChangeLog
   trunk/src/nm-device-802-11-wireless.c

Modified: trunk/src/nm-device-802-11-wireless.c
==============================================================================
--- trunk/src/nm-device-802-11-wireless.c	(original)
+++ trunk/src/nm-device-802-11-wireless.c	Fri Jan 11 22:09:21 2008
@@ -2936,10 +2936,16 @@
 	tmp_ap = get_active_ap (self, ap, TRUE);
 	if (tmp_ap) {
 		NMActRequest *req = nm_device_get_act_request (NM_DEVICE (self));
+		const GByteArray *ssid = nm_ap_get_ssid (tmp_ap);
 
 		/* Found a better match in the scan list than the fake AP.  Use it
 		 * instead.
 		 */
+
+		/* If the better match was a hidden AP, update it's SSID */
+		if (!ssid || nm_utils_is_empty_ssid (ssid->data, ssid->len))
+			nm_ap_set_ssid (tmp_ap, nm_ap_get_ssid (ap));
+
 		nm_act_request_set_specific_object (req, nm_ap_get_dbus_path (tmp_ap));
 
 		self->priv->ap_list = g_slist_remove (self->priv->ap_list, ap);