Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest

1 files changed, 12 insertions, 2 deletions

diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 1b12915d..00e520d7 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -1,10 +1,10 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
  * Copyright (C) 2007 - 2008 Novell, Inc.
  * Copyright (C) 2007 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-object.h"
 
@@ -248,6 +248,10 @@ nm_object_init(NMObject *object)
     self->_priv = priv;
 
     c_list_init(&self->obj_base.queue_notify_lst);
+
+    NML_DBUS_LOG(_NML_NMCLIENT_LOG_LEVEL_COERCE(NML_DBUS_LOG_LEVEL_TRACE),
+                 "nmobj[" NM_HASH_OBFUSCATE_PTR_FMT "]: creating",
+                 NM_HASH_OBFUSCATE_PTR(self));
 }
 
 static void
@@ -256,6 +260,12 @@ dispose(GObject *object)
     NMObject *       self = NM_OBJECT(object);
     NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE(self);
 
+    if (!self->obj_base.is_disposing) {
+        NML_DBUS_LOG(_NML_NMCLIENT_LOG_LEVEL_COERCE(NML_DBUS_LOG_LEVEL_TRACE),
+                     "nmobj[" NM_HASH_OBFUSCATE_PTR_FMT "]: disposing",
+                     NM_HASH_OBFUSCATE_PTR(self));
+    }
+
     self->obj_base.is_disposing = TRUE;
 
     nm_assert(c_list_is_empty(&self->obj_base.queue_notify_lst));