From 19be156d67864b0f360cd149fb866dd6a11eb7cd Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 23 Oct 2007 10:58:35 +0000 Subject: [PATCH] 2007-10-23 Dan Williams * src/nm-device-802-11-wireless.c - (merge_scanned_ap): use libnm-util empty SSID check to catch more non-SSID-broadcasting APs git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3003 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-802-11-wireless.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 132eb76044..5f29257a46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-23 Dan Williams + + * src/nm-device-802-11-wireless.c + - (merge_scanned_ap): use libnm-util empty SSID check to catch more + non-SSID-broadcasting APs + 2007-10-23 Dan Williams * src/NetworkManagerAP.c diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index ea16543b7e..3271c9d6f6 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -1625,7 +1625,7 @@ out: static void merge_scanned_ap (NMDevice80211Wireless *self, NMAccessPoint *merge_ap) -{ +{ NMAccessPoint * found_ap = NULL; const GByteArray *ssid; @@ -1633,7 +1633,7 @@ merge_scanned_ap (NMDevice80211Wireless *self, * if it can */ ssid = nm_ap_get_ssid (merge_ap); - if (!ssid || !ssid->len) { + if (nm_utils_is_empty_ssid (ssid->data, ssid->len)) { g_signal_emit (self, signals[HIDDEN_AP_FOUND], 0, merge_ap); nm_ap_set_broadcast (merge_ap, FALSE); }