Fix GtkToolButton possibly being empty

With style BOTH_HORIZ the label would not be selected (if not marked
"important") and when there's no icon, it would result in an empty button.

Signed-off-by: Olivier Brunel <jjk@jjacky.com>

https://bugzilla.gnome.org/show_bug.cgi?id=710134
This commit is contained in:
Olivier Brunel 2013-10-14 20:08:30 +02:00 committed by Matthias Clasen
parent 07eafbaaa8
commit 48770fda30

View File

@ -421,7 +421,7 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
need_label = TRUE;
}
if (style == GTK_TOOLBAR_ICONS && button->priv->icon_widget == NULL &&
if (style != GTK_TOOLBAR_TEXT && button->priv->icon_widget == NULL &&
button->priv->stock_id == NULL && button->priv->icon_name == NULL)
{
need_label = TRUE;