From e6084819fa1f4b2c909f794fbc3e74b6aca08097 Mon Sep 17 00:00:00 2001
From: Marion <marion.zepf@gmail.com>
Date: Wed, 19 Jun 2013 06:56:11 +0000
Subject: resolve duplicate attribute of TurtleArtWindow: 'parent' and 'activity'

---
(limited to 'TurtleArt')

diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 6152f20..e0c4030 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -99,9 +99,13 @@ _MACROS_SUBPATH = 'macros'
 class TurtleArtWindow():
     ''' TurtleArt Window class abstraction  '''
 
-    def __init__(self, canvas_window, path, parent=None,
+    def __init__(self, canvas_window, path, parent=None, activity=None,
                  mycolors=None, mynick=None, turtle_canvas=None,
                  running_sugar=True):
+        """parent -- the GTK Window that TA runs in
+        activity -- the object that instantiated this TurtleArtWindow (in 
+                    GNOME, a TurtleMain instance)
+        """
         self.parent = parent
         self.turtle_canvas = turtle_canvas
         self._loaded_project = ''
@@ -135,7 +139,7 @@ class TurtleArtWindow():
             self.interactive_mode = False
             self.window = canvas_window
             self.running_sugar = False
-        self.activity = parent
+        self.activity = activity
 
         self.path = path
         self.load_save_folder = os.path.join(path, 'samples')
--
cgit v0.9.1