Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-toolkit

2008-06-27 10:51:49 -04:00
parent 9dd0c93c69 26dd1f9a43
commit 0793312280
61 changed files with 9648 additions and 2 deletions
@@ -89,7 +89,7 @@ class RadioToolButton(gtk.RadioToolButton):
    def get_xo_color(self):
        return self._xo_color

-    xo_color = gobject.property(type=str, setter=set_xo_color,
+    xo_color = gobject.property(type=object, setter=set_xo_color,
                                getter=get_xo_color)

    def create_palette(self):