diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-06-13 13:40:29 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-06-13 13:40:29 +0000 |
| commit | 00bdd1fccebcc8560ee73afb3b89d4ca056ec326 (patch) | |
| tree | 1ba4c30a3dc89e0a13b2cb43db1b82946f9a32f4 /gtk/gtkaction.c | |
| parent | 6aaea9737875708658ae0fba9de3f7701cc9d83a (diff) | |
| download | gtk+-00bdd1fccebcc8560ee73afb3b89d4ca056ec326.tar.gz | |
change type of local "image" variable from GtkImage to GtkWidget to fix
2008-06-13 Michael Natterer <mitch@imendio.com>
* gtk/gtkaction.c (gtk_action_set_short_label): change type of
local "image" variable from GtkImage to GtkWidget to fix warning.
svn path=/trunk/; revision=20373
Diffstat (limited to 'gtk/gtkaction.c')
| -rw-r--r-- | gtk/gtkaction.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 08047f105f..fc9f5c21bf 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -1385,19 +1385,20 @@ gtk_action_set_short_label (GtkAction *action, proxy = (GtkWidget *)p->data; if (GTK_IS_TOOL_BUTTON (proxy)) - gtk_tool_button_set_label (GTK_TOOL_BUTTON (proxy), + gtk_tool_button_set_label (GTK_TOOL_BUTTON (proxy), action->private_data->short_label); else if (GTK_IS_BUTTON (proxy) && !gtk_button_get_use_stock (GTK_BUTTON (proxy))) { - GtkImage *image; + GtkWidget *image; + child = GTK_BIN (proxy)->child; image = gtk_button_get_image (GTK_BUTTON (proxy)); - + if (GTK_IS_IMAGE (image) || child == NULL || GTK_IS_LABEL (child)) - gtk_button_set_label (GTK_BUTTON (proxy), + gtk_button_set_label (GTK_BUTTON (proxy), action->private_data->short_label); } } |