core: suppress a warning when a connection is assumed

When NM takes over a device's existing connection, it'll jump right
from "unavailable" to "ip-config" states, thus leading to the
warning.
This commit is contained in:
Dan Williams 2012-07-24 12:12:18 -05:00
parent a1659adec0
commit 346a1dc957

View file

@ -2478,7 +2478,8 @@ nm_device_activate_schedule_stage3_ip_config_start (NMDevice *self)
g_return_if_fail (priv->act_request);
state = nm_device_get_state (self);
g_warn_if_fail (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_NEED_AUTH);
if (nm_act_request_get_assumed (priv->act_request) == FALSE)
g_warn_if_fail (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_NEED_AUTH);
/* Add the interface to the specified firewall zone */
connection = nm_device_get_connection (self);