gtk+ r20373 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Fri Jun 13 13:40:29 2008
New Revision: 20373
URL: http://svn.gnome.org/viewvc/gtk+?rev=20373&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkaction.c

Modified: trunk/gtk/gtkaction.c
==============================================================================
--- trunk/gtk/gtkaction.c	(original)
+++ trunk/gtk/gtkaction.c	Fri Jun 13 13:40:29 2008
@@ -1385,19 +1385,20 @@
       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);
 	}
     }