summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-10-03 18:12:11 +0200
committerThomas Haller <thaller@redhat.com>2015-10-03 18:12:11 +0200
commit6b40108418035ebb0499529f61b2a1e8aa3340e0 (patch)
tree3db3a28117121fc17fd7862930cc6d90e711e5c3
parentb74574fb0d12adaa47b63700fbbd91ab06f5950e (diff)
downloadNetworkManager-6b40108418035ebb0499529f61b2a1e8aa3340e0.tar.gz
libnm: use nm_clear_g_source() in nm-object.c
-rw-r--r--libnm/nm-object.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 2aaa4d9d96..adc22e7e09 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -33,6 +33,7 @@
#include "nm-dbus-helpers.h"
#include "nm-client.h"
#include "nm-core-internal.h"
+#include "nm-macros-internal.h"
static gboolean debug = FALSE;
#define dbgmsg(f,...) if (G_UNLIKELY (debug)) { g_message (f, ## __VA_ARGS__ ); }
@@ -1260,10 +1261,7 @@ reload_complete (NMObject *object, gboolean emit_now)
GError *error;
if (emit_now) {
- if (priv->notify_id) {
- g_source_remove (priv->notify_id);
- priv->notify_id = 0;
- }
+ nm_clear_g_source (&priv->notify_id);
deferred_notify_cb (object);
} else
_nm_object_defer_notify (object);