diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-30 11:52:06 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-11-01 17:28:07 +0100 |
| commit | 204fcd33d85f374e5992f3a3bf069958c178fc0b (patch) | |
| tree | b2a30414167a6fa2cd97df15c17a493a4217adce /libnm | |
| parent | 88a2f1c93bb2c19fc664d568f13c426a5ce7295b (diff) | |
| download | NetworkManager-204fcd33d85f374e5992f3a3bf069958c178fc0b.tar.gz | |
macros: add nm_clear_g_cancellable() utility
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-manager.c | 5 | ||||
| -rw-r--r-- | libnm/nm-remote-settings.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index c0d026291a..7ed50e3ced 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -35,6 +35,7 @@ #include "nm-vpn-connection.h" #include "nm-object-cache.h" #include "nm-dbus-helpers.h" +#include "nm-macros-internal.h" #include "nmdbus-manager.h" @@ -1255,7 +1256,7 @@ nm_running_changed_cb (GObject *object, NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager); if (!nm_manager_get_nm_running (manager)) { - NM_UTILS_CLEAR_CANCELLABLE (priv->props_cancellable); + nm_clear_g_cancellable (&priv->props_cancellable); priv->state = NM_STATE_UNKNOWN; priv->startup = FALSE; @@ -1281,7 +1282,7 @@ nm_running_changed_cb (GObject *object, } else { _nm_object_suppress_property_updates (NM_OBJECT (manager), FALSE); - NM_UTILS_CLEAR_CANCELLABLE (priv->props_cancellable); + nm_clear_g_cancellable (&priv->props_cancellable); priv->props_cancellable = g_cancellable_new (); _nm_object_reload_properties_async (NM_OBJECT (manager), priv->props_cancellable, updated_properties, manager); diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 4d240e3b38..480d7c19f5 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -34,6 +34,7 @@ #include "nm-dbus-helpers.h" #include "nm-object-private.h" #include "nm-core-internal.h" +#include "nm-macros-internal.h" #include "nmdbus-settings.h" @@ -626,7 +627,7 @@ nm_running_changed (GObject *object, GPtrArray *connections; int i; - NM_UTILS_CLEAR_CANCELLABLE (priv->props_cancellable); + nm_clear_g_cancellable (&priv->props_cancellable); /* Clear connections */ connections = priv->all_connections; @@ -651,7 +652,7 @@ nm_running_changed (GObject *object, } else { _nm_object_suppress_property_updates (NM_OBJECT (self), FALSE); - NM_UTILS_CLEAR_CANCELLABLE (priv->props_cancellable); + nm_clear_g_cancellable (&priv->props_cancellable); priv->props_cancellable = g_cancellable_new (); _nm_object_reload_properties_async (NM_OBJECT (self), priv->props_cancellable, updated_properties, self); } |