mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-04 04:50:30 +01:00
2006-11-09 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerAPList.c - (nm_ap_list_copy_one_essid_by_address): fix bug due to previous code cleanup in revision 1.56; the split of the !nm_ap_get_essid() from the nm_ap_list_get_ap_by_address() call was incorrect and broke hidden SSID matching. Found by Bill Moss. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2105 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
21a30437a0
commit
0013ae1178
2 changed files with 16 additions and 7 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2006-11-09 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/NetworkManagerAPList.c
|
||||
- (nm_ap_list_copy_one_essid_by_address): fix bug due to previous
|
||||
code cleanup in revision 1.56; the split of the !nm_ap_get_essid()
|
||||
from the nm_ap_list_get_ap_by_address() call was incorrect and
|
||||
broke hidden SSID matching. Found by Bill Moss.
|
||||
|
||||
2006-10-25 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/nm-dbus-nm.c
|
||||
|
|
|
|||
|
|
@ -588,20 +588,21 @@ nm_ap_list_copy_one_essid_by_address (NMDevice80211Wireless *dev,
|
|||
{
|
||||
NMAccessPoint * found_ap;
|
||||
|
||||
if (!ap || !search_list)
|
||||
g_return_if_fail (ap != NULL);
|
||||
|
||||
if (!search_list)
|
||||
return;
|
||||
|
||||
if (!nm_ap_get_essid (ap))
|
||||
/* Ignore APs that already have an ESSID */
|
||||
if (nm_ap_get_essid (ap))
|
||||
return;
|
||||
|
||||
found_ap = nm_ap_list_get_ap_by_address (search_list, nm_ap_get_address (ap));
|
||||
if (!found_ap)
|
||||
if (!found_ap || !nm_ap_get_essid (found_ap))
|
||||
return;
|
||||
|
||||
if (nm_ap_get_essid (found_ap)) {
|
||||
nm_ap_set_essid (ap, nm_ap_get_essid (found_ap));
|
||||
nm_dbus_signal_wireless_network_change (dev, ap, NETWORK_STATUS_APPEARED, 0);
|
||||
}
|
||||
nm_ap_set_essid (ap, nm_ap_get_essid (found_ap));
|
||||
nm_dbus_signal_wireless_network_change (dev, ap, NETWORK_STATUS_APPEARED, 0);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue