2007-12-07 Dan Williams <dcbw@redhat.com>

Noticed by Christian Persch <chpe@gnome.org>

	Always chain up to parent object in dispose and finalize handlers.
		(gnome.org #433112)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3154 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-12-07 15:32:45 +00:00
parent b91db8d429
commit eda2d662cd
17 changed files with 52 additions and 36 deletions

View File

@@ -1543,17 +1543,9 @@ nm_device_dispose (GObject *object)
{
NMDevice *self = NM_DEVICE (object);
if (self->priv->dispose_has_run) {
/* If dispose already ran, return. */
return;
}
if (!self->priv->initialized) {
/* Don't tear down stuff that might not yet be set up */
if (self->priv->dispose_has_run || !self->priv->initialized)
goto out;
}
/* Make sure dispose does not run twice. */
self->priv->dispose_has_run = TRUE;
/*