fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-06-22 Tambet Ingo <tambet@ximian.com>

Browse source 
* src/nm-device-802-11-wireless.c (merge_scanned_ap): Don't advertise constantly
	that we got a new AP when we just update existing AP properties.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2616 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo 2007-06-22 16:21:48 +00:00 • committed by Tambet Ingo
parent 636b1140c5
commit d701939287
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-06-22 Tambet Ingo <tambet@ximian.com>
* src/nm-device-802-11-wireless.c (merge_scanned_ap): Don't advertise constantly
that we got a new AP when we just update existing AP properties.
2007-06-21 Tambet Ingo <tambet@ximian.com> 2007-06-21 Tambet Ingo <tambet@ximian.com>
* libnm-glib/Makefile.am: Add NMObject to build, remove nm-utils.[ch]. * libnm-glib/Makefile.am: Add NMObject to build, remove nm-utils.[ch].

29
src/nm-device-802-11-wireless.c
View file

@ -190,12 +190,14 @@ static void cleanup_supplicant_interface (NMDevice80211Wireless * self);
static void static void
network_added (NMDevice80211Wireless *device, NMAccessPoint *ap) network_added (NMDevice80211Wireless *device, NMAccessPoint *ap)
{ {
nm_debug ("Network added: %s", nm_ap_get_essid (ap));
g_signal_emit (device, signals[NETWORK_ADDED], 0, ap); g_signal_emit (device, signals[NETWORK_ADDED], 0, ap);
} }
static void static void
network_removed (NMDevice80211Wireless *device, NMAccessPoint *ap) network_removed (NMDevice80211Wireless *device, NMAccessPoint *ap)
{ {
nm_debug ("Network removed: %s", nm_ap_get_essid (ap));
g_signal_emit (device, signals[NETWORK_REMOVED], 0, ap); g_signal_emit (device, signals[NETWORK_REMOVED], 0, ap);
} }
@ -1880,8 +1882,6 @@ merge_scanned_ap (NMDevice80211Wireless *dev,
NMAccessPointList *list; NMAccessPointList *list;
NMAccessPoint *list_ap = NULL; NMAccessPoint *list_ap = NULL;
gboolean strength_changed = FALSE;
gboolean new = FALSE;
const struct ether_addr *merge_bssid; const struct ether_addr *merge_bssid;
list = nm_device_802_11_wireless_ap_list_get (dev); list = nm_device_802_11_wireless_ap_list_get (dev);
@ -1899,18 +1899,8 @@ merge_scanned_ap (NMDevice80211Wireless *dev,
const char *merge_essid = nm_ap_get_essid (merge_ap); const char *merge_essid = nm_ap_get_essid (merge_ap);
const glong merge_ap_seen = nm_ap_get_last_seen (merge_ap); const glong merge_ap_seen = nm_ap_get_last_seen (merge_ap);
/* Did the AP's name change? */
if (!devlist_essid || !merge_essid || nm_null_safe_strcmp (devlist_essid, merge_essid)) {
network_removed (dev, list_ap);
new = TRUE;
}
nm_ap_set_capabilities (list_ap, nm_ap_get_capabilities (merge_ap)); nm_ap_set_capabilities (list_ap, nm_ap_get_capabilities (merge_ap));
if (nm_ap_get_strength (merge_ap) != nm_ap_get_strength (list_ap)) { nm_ap_set_strength (list_ap, nm_ap_get_strength (merge_ap));
nm_ap_set_strength (list_ap, nm_ap_get_strength (merge_ap));
strength_changed = TRUE;
}
nm_ap_set_last_seen (list_ap, merge_ap_seen); nm_ap_set_last_seen (list_ap, merge_ap_seen);
nm_ap_set_broadcast (list_ap, nm_ap_get_broadcast (merge_ap)); nm_ap_set_broadcast (list_ap, nm_ap_get_broadcast (merge_ap));
@ -1919,12 +1909,12 @@ merge_scanned_ap (NMDevice80211Wireless *dev,
*/ */
nm_ap_set_artificial (list_ap, FALSE); nm_ap_set_artificial (list_ap, FALSE);
/* Have to change AP's name _after_ dbus signal for old network name /* Did the AP's name change? */
* has gone out. if (!devlist_essid || !merge_essid || nm_null_safe_strcmp (devlist_essid, merge_essid)) {
*/ network_removed (dev, list_ap);
nm_ap_set_essid (list_ap, merge_essid); nm_ap_set_essid (list_ap, merge_essid);
network_added (dev, list_ap);
network_added (dev, list_ap); }
} }
else if ((list_ap = nm_ap_list_get_ap_by_essid (list, nm_ap_get_essid (merge_ap)))) else if ((list_ap = nm_ap_list_get_ap_by_essid (list, nm_ap_get_essid (merge_ap))))
{ {
@ -1961,7 +1951,6 @@ merge_scanned_ap (NMDevice80211Wireless *dev,
nm_ap_list_append_ap (list, merge_ap); nm_ap_list_append_ap (list, merge_ap);
network_added (dev, merge_ap); network_added (dev, merge_ap);
list_ap = merge_ap; list_ap = merge_ap;
new = TRUE;
} }
} }