2007-12-05 Tambet Ingo <tambet@gmail.com>
* src/nm-umts-device.c (dial_done): Fix the typoes in warnings. (get_network_done): Remove newline, nm_info() does it already. (real_act_stage1_prepare): Turn the modem echo off. * src/NetworkManagerSystem.c * (nm_system_device_set_from_ip4_config): In case of serial device, set the route to the device interface. This is a hack. * src/nm-serial-device.c (nm_serial_device_send_command_string): * Only append carriage return, no need for a new-line. (ppp_ip4_config): Store the ip4 config to be set in the next stage. Change the device iface here (ugh). (real_act_stage4_get_ip4_config): Implement. (real_deactivate_quickly): Free the pending ip4 config if it's still pending. Restore the device iface. * src/NetworkManagerPolicy.c (nm_policy_device_change_check): Do * nothing if the active device is not wired or wireless (eg, automatically upped) device. * src/ppp-manager/nm-ppp-manager.c (ip4_config_get): Don't make * the config secondary, it isn't. (nm_ppp_manager_start): Don't let pppd to set the default route, we want to do it. * src/nm-hal-manager.c (get_creator): Make sure the device has * required capability before calling it's is_device_fn(). git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3137 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -236,6 +236,11 @@ nm_policy_device_change_check (gpointer user_data)
|
||||
switch (nm_manager_get_state (policy->manager)) {
|
||||
case NM_STATE_CONNECTED:
|
||||
old_dev = nm_manager_get_active_device (policy->manager);
|
||||
|
||||
/* Don't touch devices that are not upped/downed automatically */
|
||||
if (!NM_IS_DEVICE_802_3_ETHERNET (old_dev) && !NM_IS_DEVICE_802_11_WIRELESS (old_dev))
|
||||
goto out;
|
||||
|
||||
caps = nm_device_get_capabilities (old_dev);
|
||||
|
||||
/* Don't interrupt semi-supported devices. If the user chose
|
||||
|
Reference in New Issue
Block a user