From d577566151c7dd7287d5609730861b006158b1e4 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 09 Nov 2007 16:38:09 +0000
Subject: Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar

Conflicts:

	NEWS
---
(limited to 'lib')

diff --git a/lib/sugar/graphics/menuitem.py b/lib/sugar/graphics/menuitem.py
index 5b457a5..1b90843 100644
--- a/lib/sugar/graphics/menuitem.py
+++ b/lib/sugar/graphics/menuitem.py
@@ -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)
--
cgit v0.9.1