diff options
author | Olivier Brunel <jjk@jjacky.com> | 2013-10-14 20:08:30 +0200 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2013-10-15 21:44:18 -0400 |
commit | 48770fda3018ca5f418493be5b0f6aa083e8a14f (patch) | |
tree | 9867d69a6032761ee8b10ab3f716d1e02ab5b736 /gtk/gtktoolbutton.c | |
parent | 07eafbaaa88ded2d57b5696c842dbb7059f05434 (diff) | |
download | gtk+-48770fda3018ca5f418493be5b0f6aa083e8a14f.tar.gz |
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
Diffstat (limited to 'gtk/gtktoolbutton.c')
-rw-r--r-- | gtk/gtktoolbutton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 7acfc9f00d..0aeea1b497 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -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; |