From d41e3a424454bc57f1772c5ba69eb7282ddb7f8f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 10 Oct 2005 12:57:49 +0000 Subject: [PATCH] 2005-10-10 Dan Williams * 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 --- ChangeLog | 5 +++++ src/NetworkManagerPolicy.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e1efaa605a..a2997e503e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-10 Dan Williams + + * src/NetworkManagerPolicy.c + - Fix some bugs introduced by the capabilities patch + 2005-10-10 Dan Williams * gnome/applet/applet-dbus-info.c diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c index bd6df8f4d5..3b8a712af6 100644 --- a/src/NetworkManagerPolicy.c +++ b/src/NetworkManagerPolicy.c @@ -260,6 +260,9 @@ static NMDevice * nm_policy_auto_get_best_device (NMData *data, NMAccessPoint ** if (!(caps & NM_DEVICE_CAP_WIRELESS_SCAN)) continue; + /* Bump by 1 so that _something_ gets chosen every time */ + prio += 1; + if (link_active) 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 * 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_info ("Old device '%s' was semi-supported and user chosen, won't change unless told to.",