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

Conflicts:

	shell/view/home/IconLayout.py

1 files changed, 15 insertions, 9 deletions

diff --git a/tests/test-icon-layout.py b/tests/test-icon-layout.py
index 30d7cad..1e3a20b 100755
--- a/tests/test-icon-layout.py
+++ b/tests/test-icon-layout.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 import pygtk
 pygtk.require('2.0')
+import gobject
 
 from sugar.session.UITestSession import UITestSession
 
@@ -17,6 +18,18 @@ from view.home.IconLayout import IconLayout
 from sugar.canvas import IconColor
 from sugar.canvas.IconItem import IconItem
 from sugar.canvas.CanvasView import CanvasView
+from sugar.canvas.Grid import Grid
+
+def _create_icon():
+	color = IconColor.IconColor()
+
+	icon = IconItem(size=125, color=color,
+					icon_name='stock-buddy')
+	root.add_child(icon)
+
+	icon_layout.add_icon(icon)
+
+	return (root.get_n_children() < 20)
 
 window = gtk.Window()
 window.connect("destroy", lambda w: gtk.main_quit())
@@ -33,16 +46,9 @@ item = goocanvas.Rect(x=0, y=0, width=1200, height=900,
                       line_width=0.0, fill_color='#e2e2e2')
 root.add_child(item)
 
-icon_layout = IconLayout(1200, 900)
-
-for i in range(0, 20):
-	color = IconColor.IconColor()
+icon_layout = IconLayout(Grid())
 
-	icon = IconItem(size=75, color=color,
-					icon_name='stock-buddy')
-	root.add_child(icon)
-
-	icon_layout.add_icon(icon)
+gobject.timeout_add(500, _create_icon)
 
 canvas.set_model(canvas_model)