diff options
| author | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-05-11 15:03:26 +0200 |
| commit | 04996460fa839109b6318838d1f41e5f3ef8139a (patch) | |
| tree | cb35e54363b8ea8e78e6978a92fb68ae9409e116 /src/devices/bluetooth/nm-bluez-manager.c | |
| parent | 1ae6f6dc1b3c266401a4709995991b967320139a (diff) | |
| parent | c333f062ddcba9b35330647bf6cbd0a07f2d786e (diff) | |
Merge tag 'upstream/1.8.0' into experimental
Upstream version 1.8.0
Diffstat (limited to 'src/devices/bluetooth/nm-bluez-manager.c')
| -rw-r--r-- | src/devices/bluetooth/nm-bluez-manager.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index 58fa9b01..2f0afa16 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -134,10 +134,7 @@ cleanup_checking (NMBluezManager *self, gboolean do_unwatch_name) { NMBluezManagerPrivate *priv = NM_BLUEZ_MANAGER_GET_PRIVATE (self); - if (priv->async_cancellable) { - g_cancellable_cancel (priv->async_cancellable); - g_clear_object (&priv->async_cancellable); - } + nm_clear_g_cancellable (&priv->async_cancellable); g_clear_object (&priv->introspect_proxy); |