app: unparent GimpDockBook's menu button in dispose() not finalize()

because unparenting requires a fully functional object that can
be used as signal parameter. I have no clue why this doesn't
trigger criticals on X11.
This commit is contained in:
Michael Natterer
2011-10-04 23:51:54 +02:00
parent 29a6c71f00
commit 1459f5bb61

View File

@ -312,6 +312,12 @@ gimp_dockbook_dispose (GObject *object)
while (dockbook->p->dockables)
gimp_dockbook_remove (dockbook, dockbook->p->dockables->data);
if (dockbook->p->menu_button)
{
gtk_widget_unparent (dockbook->p->menu_button);
dockbook->p->menu_button = NULL;
}
G_OBJECT_CLASS (parent_class)->dispose (object);
}
@ -326,12 +332,6 @@ gimp_dockbook_finalize (GObject *object)
dockbook->p->ui_manager = NULL;
}
if (dockbook->p->menu_button)
{
gtk_widget_unparent (dockbook->p->menu_button);
dockbook->p->menu_button = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}