Update upstream source from tag 'upstream/1.11.4'

Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e

1 files changed, 1 insertions, 12 deletions

diff --git a/src/nm-dbus-object.c b/src/nm-dbus-object.c
index 514fda49..e92a8f5f 100644
--- a/src/nm-dbus-object.c
+++ b/src/nm-dbus-object.c
@@ -26,17 +26,6 @@
 
 /*****************************************************************************/
 
-static gboolean quitting = FALSE;
-
-void
-nm_dbus_object_set_quitting (void)
-{
-	nm_assert (!quitting);
-	quitting = TRUE;
-}
-
-/*****************************************************************************/
-
 enum {
 	EXPORTED_CHANGED,
 
@@ -291,7 +280,7 @@ dispose (GObject *object)
 	 * we are quitting, where many objects stick around until exit.
 	 */
 	if (self->internal.path) {
-		if (!quitting)
+		if (!nm_dbus_manager_is_stopping (nm_dbus_object_get_manager (self)))
 			g_warn_if_reached ();
 		nm_dbus_object_unexport (self);
 	}