AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-21 14:24:19 +00:00
Code Issues Projects Releases Wiki Activity

assistant: Avoid tripping template tests

Browse Source 
We need to unset the titlebar manually before chaining up
in destroy, otherwise we trigger the template invariant
checking - GtkWindow would eventually unset it, but too late
for the invariants checking code in gtk_widget_destroy.
This commit is contained in:
Matthias Clasen 2016-01-27 12:57:58 -05:00
parent 0d109867d2
commit 88c3456d2f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkassistant.c
View File

@ -303,7 +303,7 @@ apply_use_header_bar (GtkAssistant *assistant)
gtk_widget_set_visible (priv->headerbar, priv->use_header_bar);
if (!priv->use_header_bar)
gtk_window_set_titlebar (GTK_WINDOW (assistant), NULL);
if (priv->use_header_bar)
else
g_signal_connect (priv->action_area, "add", G_CALLBACK (add_cb), assistant);
}
@ -1365,6 +1365,7 @@ gtk_assistant_destroy (GtkWidget *widget)
priv->visited_pages = NULL;
}
gtk_window_set_titlebar (GTK_WINDOW (widget), NULL);
GTK_WIDGET_CLASS (gtk_assistant_parent_class)->destroy (widget);
}