homer drops his donut, doh, homer spills his soda, doh, homer hits the doorway, doh, homer ruins his whole day, doh!

main.go

@@ -550,13 +550,10 @@ func main() {
 			})
 
 			box.Append(b)
-			go func() {
-				new_im := getAvatar(jid, jid) // TODO: Use PEP avatar and do not use JID as hash
-				glib.IdleAdd(func() {
-					new_im.SetPixelSize(40)
-					box.Prepend(new_im)
-				})
-			}()
+			im := gtk.NewImage()
+			im.SetPixelSize(40)
+			go getAvatar(jid, jid, im)
+			box.Prepend(im)
 
 			box.AddController(gesture1)
 			menu.Append(box)
@@ -602,7 +599,15 @@ func main() {
 							box.SetVisible(false)
 						})
 
+						im := gtk.NewImage()
+						im.SetPixelSize(40)
+
+						box.Append(im)
 						box.Append(b)
+
+						go getAvatar(jid, jid, im)
+						/*
+
 						go func() {
 							new_im := getAvatar(jid, jid) // TODO: Use PEP avatar and do not use JID as hash
 							glib.IdleAdd(func() {
@@ -610,6 +615,7 @@ func main() {
 								box.Prepend(new_im)
 							})
 						}()
+						*/
 
 						box.AddController(gesture1)
 						menu.Append(box)
@@ -690,7 +696,15 @@ func main() {
 										removeTab(jid, &window.Window)
 										box.SetVisible(false)
 									})
+
+									im := gtk.NewImage()
+									im.SetPixelSize(40)
+
 									box.Append(b)
+									box.Prepend(im)
+
+									go getAvatar(jid, jid, im)
+									/*
 									go func() {
 										new_im := getAvatar(jid, jid)
 										glib.IdleAdd(func() {
@@ -698,6 +712,7 @@ func main() {
 											box.Prepend(new_im)
 										})
 									}()
+									*/
 
 									box.AddController(gesture1)
 									box.AddController(gesture2)
@@ -990,6 +1005,11 @@ func activate(app *gtk.Application) {
 
 				createTab(t, true, n)
 				box := gtk.NewBox(gtk.OrientationHorizontal, 10)
+				im := gtk.NewImage()
+				im.SetPixelSize(40)
+
+				go getAvatar(t, t, im)
+				/*
 				go func() {
 					new_im := getAvatar(t, t)
 					glib.IdleAdd(func() {
@@ -997,7 +1017,10 @@ func activate(app *gtk.Application) {
 						box.Prepend(new_im)
 					})
 				}()
+				*/
 				b := gtk.NewLabel(n)
+
+				box.Append(im)
 				box.Append(b)
 				gesture1 := gtk.NewGestureClick()
 				gesture1.SetButton(1)