diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-10-12 15:13:20 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-10-17 13:03:50 +0200 |
| commit | dd4968fa16ab96fe133d87d08a7e167232ec43cb (patch) | |
| tree | a134b0f06049d12bee89ff4c71ccdb8ec6c676c0 /src/devices/adsl | |
| parent | 9b935fad9b108ee10299f2bd56f27db59ee34637 (diff) | |
| download | NetworkManager-dd4968fa16ab96fe133d87d08a7e167232ec43cb.tar.gz | |
ppp: make ppp-manager cancellable via GCancellable
Previously nm_ppp_manager_stop() would return a handle which
makes it easy to cancel the operation.
However, sometimes, we may want to cancel an operation based on
an GCancellable. So, extend nm_ppp_manager_stop() to hook it
with a cancellable.
Essentially, move the code from nm-modem.c to nm-ppp-manager-call.c,
where it belongs and where the functionality gets available to every
component.
Diffstat (limited to 'src/devices/adsl')
| -rw-r--r-- | src/devices/adsl/nm-device-adsl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index c9984f5135..9cec81920f 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -523,7 +523,7 @@ adsl_cleanup (NMDeviceAdsl *self) if (priv->ppp_manager) { g_signal_handlers_disconnect_by_func (priv->ppp_manager, G_CALLBACK (ppp_state_changed), self); g_signal_handlers_disconnect_by_func (priv->ppp_manager, G_CALLBACK (ppp_ip4_config), self); - nm_ppp_manager_stop (priv->ppp_manager, NULL, NULL); + nm_ppp_manager_stop (priv->ppp_manager, NULL, NULL, NULL); g_clear_object (&priv->ppp_manager); } |