AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 23:10:22 +00:00
Code Issues Projects Releases Wiki Activity

GtkApplicationWindow: Consistently unparent menubar

Browse Source 
We create it floating, and don't hold an extra ref, so we should
just unparent it.
This commit is contained in:
Colin Walters 2011-12-01 22:13:56 -05:00 committed by Ryan Lortie
parent c299963428
commit c7e7237559
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkapplicationwindow.c
View File

@ -87,7 +87,6 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window)
if (have_menubar && !should_have_menubar) if (have_menubar && !should_have_menubar)
{ {
gtk_widget_unparent (window->priv->menubar); gtk_widget_unparent (window->priv->menubar);
g_object_unref (window->priv->menubar);
window->priv->menubar = NULL; window->priv->menubar = NULL;
gtk_widget_queue_resize (GTK_WIDGET (window)); gtk_widget_queue_resize (GTK_WIDGET (window));
@ -503,7 +502,11 @@ gtk_application_window_dispose (GObject *object)
{ {
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (object); GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (object);
g_clear_object (&window->priv->menubar); if (window->priv->menubar)
{
gtk_widget_unparent (window->priv->menubar);
window->priv->menubar = NULL;
}
g_clear_object (&window->priv->actions); g_clear_object (&window->priv->actions);
G_OBJECT_CLASS (gtk_application_window_parent_class) G_OBJECT_CLASS (gtk_application_window_parent_class)