Author: johan
Date: Sun Feb 17 22:53:29 2008
New Revision: 19608
URL: http://svn.gnome.org/viewvc/gtk+?rev=19608&view=rev
Log:
2008-02-17 Johan Dahlin <[EMAIL PROTECTED]>
Merged from trunk:
* gtk/gtk-builder-convert
(GtkBuilderConverter._add_action_from_menuitem):
When converting a stock item based on the label, remove the label
property.
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 Feb 17 22:53:29 2008
@@ -421,15 +421,14 @@
raise NotImplementedError(object_class)
if get_property(node, 'use_stock') == 'True':
- child = get_property_node(node, 'label')
- if child:
+ if 'label' in properties:
properties['stock_id'] = child
+ del properties['label']
properties['name'] = object_id
action = self._create_object(name,
object_id,
properties=properties)
-
for signal in get_signal_nodes(node):
signal_name = signal.getAttribute('name')
if signal_name in ['activate', 'toggled']:
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
