diff options
| -rw-r--r-- | src/nm-dbus-object.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/nm-dbus-object.c b/src/nm-dbus-object.c index 014f30f40c..514fda4977 100644 --- a/src/nm-dbus-object.c +++ b/src/nm-dbus-object.c @@ -290,16 +290,10 @@ dispose (GObject *object) /* Objects should have already been unexported by their owner, unless * we are quitting, where many objects stick around until exit. */ - if (!quitting) { - if (self->internal.path) { + if (self->internal.path) { + if (!quitting) g_warn_if_reached (); - nm_dbus_object_unexport (self); - } - } else if (self->internal.path) { - /* FIXME: do a proper, coordinate shutdown, so that no objects stay - * alive nor exported. */ - _emit_exported_changed (self); - nm_clear_g_free (&self->internal.path); + nm_dbus_object_unexport (self); } G_OBJECT_CLASS (nm_dbus_object_parent_class)->dispose (object); |