Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar

Conflicts: NEWS
2007-11-09 17:38:09 +01:00
parent bdfbe8d673 213259233d
commit d577566151
3 changed files with 25 additions and 9 deletions
@@ -19,7 +19,7 @@ import gtk
 from sugar.graphics.icon import Icon

 class MenuItem(gtk.ImageMenuItem):
-    def __init__(self, text_label, icon_name=None):
+    def __init__(self, text_label=None, icon_name=None):
        gtk.ImageMenuItem.__init__(self, text_label)
        if icon_name:
            icon = Icon(icon_name=icon_name, icon_size=gtk.ICON_SIZE_MENU)