2006-01-06 Robert Love <rml@novell.com>

* src/NetworkManagerPolicy.c: Always prefer wired to wireless, as the
	  user plugging in a network cable signals their preference for to
	  switch, unless the user explicitly selected a wireless network and
	  therefore signaled their preference for said wireless network over
	  wired.  In other words, do exactly what makes sense.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1279 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-01-06 22:04:03 +00:00 committed by Robert Love
parent af619b1594
commit 5e62f41321
2 changed files with 11 additions and 3 deletions

View file

@ -1,3 +1,11 @@
2006-01-06 Robert Love <rml@novell.com>
* src/NetworkManagerPolicy.c: Always prefer wired to wireless, as the
user plugging in a network cable signals their preference for to
switch, unless the user explicitly selected a wireless network and
therefore signaled their preference for said wireless network over
wired. In other words, do exactly what makes sense.
2006-01-06 Robert Love <rml@novell.com>
* src/NetworkManagerDevice.c, src/NetworkManagerDevice.h,

View file

@ -332,7 +332,7 @@ static gboolean nm_policy_device_change_check (NMData *data)
if (!old_dev && !new_dev)
{
/* Do nothing, wait for something like link-state to change, or an access point to be found */
; /* Do nothing, wait for something like link-state to change, or an access point to be found */
}
else if (!old_dev && new_dev)
{
@ -386,10 +386,10 @@ static gboolean nm_policy_device_change_check (NMData *data)
es, link);
do_switch = TRUE;
}
}
} /* Always prefer Ethernet over wireless, unless the user explicitly switched away. */
else if (nm_device_is_802_3_ethernet (new_dev))
{
if (!nm_device_has_active_link (old_dev))
if (!old_user_requested)
do_switch = TRUE;
}
}