summaryrefslogtreecommitdiff
path: root/gtk/gtkheaderbar.c
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-12-13 01:11:27 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2013-12-13 01:11:27 -0500
commitcf8fb209e3dfde23a1ebf77eb28335ae00150e88 (patch)
tree158e949fa854596ae06393386d4757bf218bbf1e /gtk/gtkheaderbar.c
parenta3933f96eb75a81f1218c082801db68327a667fc (diff)
downloadgtk+-cf8fb209e3dfde23a1ebf77eb28335ae00150e88.tar.gz
headerbar: Don't add hidden widgets
This is a much simpler fix.
Diffstat (limited to 'gtk/gtkheaderbar.c')
-rw-r--r--gtk/gtkheaderbar.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 0b2007699f..70a77d7e15 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -359,12 +359,16 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
if (strcmp (t[j], "icon") == 0)
{
button = gtk_image_new ();
+ priv->titlebar_icon = button;
gtk_style_context_add_class (gtk_widget_get_style_context (button), "titlebutton");
gtk_widget_set_size_request (button, 20, 20);
gtk_widget_show (button);
- priv->titlebar_icon = button;
if (!_gtk_header_bar_update_window_icon (bar, window))
- gtk_widget_hide (button);
+ {
+ gtk_widget_destroy (button);
+ priv->titlebar_icon = NULL;
+ button = NULL;
+ }
}
else if (strcmp (t[j], "menu") == 0 && menu != NULL)
{