diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-02-06 09:53:34 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-02-06 09:53:34 +0000 |
| commit | e7355f82c2409f545210a8738bab262548f75e69 (patch) | |
| tree | cf5729a1d44df53056bb9e67b355bd791994fb0f /gtk/gtktoolbutton.c | |
| parent | 0f1958e355b3c9948f0f1de4487c9a4ac57bda6f (diff) | |
| download | gtk+-e7355f82c2409f545210a8738bab262548f75e69.tar.gz | |
gtk/gtkcontainer.c gtk/gtkexpander.c gtk/gtkframe.c gtk/gtklabel.c
2008-02-06 Michael Natterer <mitch@imendio.com>
* gtk/gtkcontainer.c
* gtk/gtkexpander.c
* gtk/gtkframe.c
* gtk/gtklabel.c
* gtk/gtkmain.c
* gtk/gtkmenu.c
* gtk/gtkmenuitem.c
* gtk/gtkmenushell.c
* gtk/gtknotebook.c
* gtk/gtkseparatortoolitem.c
* gtk/gtksocket.c
* gtk/gtktextlayout.c
* gtk/gtktoggletoolbutton.c
* gtk/gtktoolbutton.c
* gtk/gtktoolitem.c
* gtk/gtktree.c
* gtk/gtktreeitem.c: replace "foo && GTK_IS_FOO (foo)" by simply
"GTK_IS_FOO (foo)".
svn path=/trunk/; revision=19481
Diffstat (limited to 'gtk/gtktoolbutton.c')
| -rw-r--r-- | gtk/gtktoolbutton.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 1555311701..a38da3ab31 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -614,7 +614,7 @@ gtk_tool_button_create_menu_proxy (GtkToolItem *item) gboolean use_mnemonic = TRUE; const char *label; - if (button->priv->label_widget && GTK_IS_LABEL (button->priv->label_widget)) + if (GTK_IS_LABEL (button->priv->label_widget)) { label = gtk_label_get_label (GTK_LABEL (button->priv->label_widget)); use_mnemonic = gtk_label_get_use_underline (GTK_LABEL (button->priv->label_widget)); @@ -638,7 +638,7 @@ gtk_tool_button_create_menu_proxy (GtkToolItem *item) else menu_item = gtk_image_menu_item_new_with_label (label); - if (button->priv->icon_widget && GTK_IS_IMAGE (button->priv->icon_widget)) + if (GTK_IS_IMAGE (button->priv->icon_widget)) { menu_image = clone_image_menu_size (GTK_IMAGE (button->priv->icon_widget), gtk_widget_get_settings (GTK_WIDGET (button))); |