gtk+ r19925 - in branches/gtk-2-12: . gtk

[johan svn gnome org]

Author: johan
Date: Sun Mar 23 08:22:14 2008
New Revision: 19925
URL: http://svn.gnome.org/viewvc/gtk+?rev=19925&view=rev

Log:
2008-03-23  Johan Dahlin  <johan gnome org>

        Merged from trunk:

        * gtk/gtk-builder-convert:
        Properly convert GtkImageMenuItems which use stock labels but don't
        have any children.
        (#523932, Brian Pepple)



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtk-builder-convert

Modified: branches/gtk-2-12/gtk/gtk-builder-convert
==============================================================================
--- branches/gtk-2-12/gtk/gtk-builder-convert	(original)
+++ branches/gtk-2-12/gtk/gtk-builder-convert	Sun Mar 23 08:22:14 2008
@@ -422,7 +422,7 @@
 
         if get_property(node, 'use_stock') == 'True':
             if 'label' in properties:
-                properties['stock_id'] = child
+                properties['stock_id'] = properties['label']
                 del properties['label']
 
         properties['name'] = object_id