colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-10-10 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/NetworkManagerPolicy.c
		- Fix some bugs introduced by the capabilities patch


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1013 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-10-10 12:57:49 +00:00
parent 2baf5855c0
commit d41e3a4244
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2005-10-10 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c
- Fix some bugs introduced by the capabilities patch
2005-10-10 Dan Williams <dcbw@redhat.com> 2005-10-10 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet-dbus-info.c * gnome/applet/applet-dbus-info.c

5
src/NetworkManagerPolicy.c
View File

@@ -260,6 +260,9 @@ static NMDevice * nm_policy_auto_get_best_device (NMData *data, NMAccessPoint **
if (!(caps & NM_DEVICE_CAP_WIRELESS_SCAN)) if (!(caps & NM_DEVICE_CAP_WIRELESS_SCAN))
continue; continue;
/* Bump by 1 so that _something_ gets chosen every time */
prio += 1;
if (link_active) if (link_active)
prio += 1; prio += 1;
@@ -335,7 +338,7 @@ static gboolean nm_policy_device_change_check (NMData *data)
/* Don't interrupt semi-supported devices either. If the user chose one, they must /* Don't interrupt semi-supported devices either. If the user chose one, they must
* explicitly choose to move to another device, we're not going to move for them. * explicitly choose to move to another device, we're not going to move for them.
*/ */
if ((nm_device_is_wireless (old_dev) && !(caps & NM_DEVICE_CAP_CARRIER_DETECT)) if ((nm_device_is_wired (old_dev) && !(caps & NM_DEVICE_CAP_CARRIER_DETECT))
|| (nm_device_is_wireless (old_dev) && !(caps & NM_DEVICE_CAP_WIRELESS_SCAN))) || (nm_device_is_wireless (old_dev) && !(caps & NM_DEVICE_CAP_WIRELESS_SCAN)))
{ {
nm_info ("Old device '%s' was semi-supported and user chosen, won't change unless told to.", nm_info ("Old device '%s' was semi-supported and user chosen, won't change unless told to.",