From d489b83b4bf17cec00c10316d3e2d85ca7d92380 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Tue, 03 Dec 2013 17:08:02 +0000
Subject: resync with 194

---
(limited to 'TurtleArt/tawindow.py')

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 81b1251..5b9a1c6 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -2205,7 +2205,8 @@ before making changes to your program'))
         if self.running_sugar:
             self.activity.empty_trash_alert(title, msg)
         else:
-            dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK_CANCEL, msg)
+            dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING,
+                                       gtk.BUTTONS_OK_CANCEL, msg)
             dialog.set_title(title)
             res = dialog.run()
             dialog.destroy()
@@ -2213,13 +2214,13 @@ before making changes to your program'))
                 self._empty_trash()
 
     def _empty_trash(self):
+        remove_list = []
         for blk in self.block_list.list:
             if blk.type == 'trash':
-                blk.type = 'deleted'
                 blk.spr.hide()
-        for blk in self.block_list.list:
-            if blk.type == 'deleted':
-                self.block_list.list.remove(blk)
+                remove_list.append(blk)
+        for blk in remove_list:
+            self.block_list.list.remove(blk)
         self.trash_stack = []
         if 'trash' in palette_names:
             self.show_toolbar_palette(palette_names.index('trash'),
--
cgit v0.9.1