gtk+ r20985 - in trunk: . gtk

[bjornl svn gnome org]

Author: bjornl
Date: Mon Aug  4 21:37:02 2008
New Revision: 20985
URL: http://svn.gnome.org/viewvc/gtk+?rev=20985&view=rev

Log:
2008-08-04  BjÃrn Lindqvist  <bjourne gmail com>

	Bug 534979 â GtkImageMenuItem is a bin but has two children.

	* gtk/gtkimagemenuitem.c (gtk_image_menu_item_forall): Do not
	include the image widget when iterating over non-internal
	children. Patch by rainwoodman.


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

Modified: trunk/gtk/gtkimagemenuitem.c
==============================================================================
--- trunk/gtk/gtkimagemenuitem.c	(original)
+++ trunk/gtk/gtkimagemenuitem.c	Mon Aug  4 21:37:02 2008
@@ -352,7 +352,7 @@
 								      callback,
 								      callback_data);
 
-  if (image_menu_item->image)
+  if (include_internals && image_menu_item->image)
     (* callback) (image_menu_item->image, callback_data);
 }