diff options
| author | Michael Biebl <biebl@debian.org> | 2016-05-11 17:09:14 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-05-11 17:09:14 +0200 |
| commit | c74718aa5a356199a1ff957b2579153d54be9dd5 (patch) | |
| tree | cf3ade8c1e7322792ec140f09ee5e083382c5c48 /src/devices/wwan/nm-modem.c | |
| parent | 6bb523977deede318916fe01c78f776d215cebff (diff) | |
| parent | 73e152af6e3fb4f5848bfb8394484026ff119003 (diff) | |
Merge tag 'upstream/1.2.2'
Upstream version 1.2.2
Diffstat (limited to 'src/devices/wwan/nm-modem.c')
| -rw-r--r-- | src/devices/wwan/nm-modem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 804a6d9c..a6c77007 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -1187,6 +1187,7 @@ nm_modem_device_state_changed (NMModem *self, case NM_DEVICE_STATE_UNMANAGED: case NM_DEVICE_STATE_UNAVAILABLE: case NM_DEVICE_STATE_FAILED: + case NM_DEVICE_STATE_DISCONNECTED: if (priv->act_request) { cancel_get_secrets (self); g_object_unref (priv->act_request); @@ -1195,7 +1196,7 @@ nm_modem_device_state_changed (NMModem *self, if (was_connected) { /* Don't bother warning on FAILED since the modem is already gone */ - if (new_state == NM_DEVICE_STATE_FAILED) + if (new_state == NM_DEVICE_STATE_FAILED || new_state == NM_DEVICE_STATE_DISCONNECTED) warn = FALSE; /* First cleanup */ NM_MODEM_GET_CLASS (self)->deactivate_cleanup (self, NULL); |