diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-03-13 11:51:33 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-03-13 12:00:23 +0100 |
| commit | ec2681d4dbe4f28f5ed08d4c1eef11685e76ebc1 (patch) | |
| tree | 4a16300a7b5dcb37411eedd16ee948b850eb3634 /libnm | |
| parent | e1ea22ca8195bec243c7a65f36be65cbf2061297 (diff) | |
| download | NetworkManager-ec2681d4dbe4f28f5ed08d4c1eef11685e76ebc1.tar.gz | |
all: use nm_clear_g_cancellable()
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-client.c | 5 | ||||
| -rw-r--r-- | libnm/nm-manager.c | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 17c31bf043..ccc96e947e 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -2525,10 +2525,7 @@ dispose (GObject *object) { NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (object); - if (priv->new_object_manager_cancellable) { - g_cancellable_cancel (priv->new_object_manager_cancellable); - g_clear_object (&priv->new_object_manager_cancellable); - } + nm_clear_g_cancellable (&priv->new_object_manager_cancellable); if (priv->manager) { g_signal_handlers_disconnect_by_data (priv->manager, object); diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 5520b580d9..d3df73375b 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -1274,11 +1274,7 @@ dispose (GObject *object) NMManager *manager = NM_MANAGER (object); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (object); - if (priv->perm_call_cancellable) { - g_cancellable_cancel (priv->perm_call_cancellable); - g_clear_object (&priv->perm_call_cancellable); - } - + nm_clear_g_cancellable (&priv->perm_call_cancellable); if (priv->devices) { g_ptr_array_unref (priv->devices); |