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

Conflicts:

	sugar/graphics/canvasicon.py
This commit is contained in:
Marco Pesenti Gritti 2007-01-27 01:39:22 +01:00
commit cdf46c52af

View File

@ -247,7 +247,6 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
[icon_width, icon_height] = self._get_icon_size()
x = (width - icon_width) / 2
y = (height - icon_height) / 2
print x, y, width, icon_width
cr.set_source_surface(buf, x, y)
cr.paint()