From de3559c1337deb90486c3de248866dc6bb566993 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 19 May 2010 12:45:21 +0000
Subject: aslroot patch for #1999

---
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index e70bceb..82b605e 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -191,8 +191,8 @@ class TurtleArtActivity(activity.Activity):
     def do_load_ta_project_cb(self, button):
         """ Load a project from the Journal """
         from sugar.graphics.objectchooser import ObjectChooser
-        chooser = ObjectChooser(_("Project"), None, gtk.DIALOG_MODAL | \
-            gtk.DIALOG_DESTROY_WITH_PARENT)
+        chooser = ObjectChooser(_("Project"), self,
+                              gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT)
         try:
             result = chooser.run()
             if result == gtk.RESPONSE_ACCEPT:
@@ -218,8 +218,8 @@ class TurtleArtActivity(activity.Activity):
     def import_py(self):
         """ Import Python code from the Journal to load into 'myblock'. """
         from sugar.graphics.objectchooser import ObjectChooser
-        chooser = ObjectChooser('Python code', None, gtk.DIALOG_MODAL | \
-            gtk.DIALOG_DESTROY_WITH_PARENT)
+        chooser = ObjectChooser('Python code', self,
+                              gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT)
         try:
             result = chooser.run()
             if result == gtk.RESPONSE_ACCEPT:
diff --git a/tawindow.py b/tawindow.py
index aa0bd4a..3a8f1d5 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -73,6 +73,7 @@ class TurtleArtWindow():
     def __init__(self, win, path, parent=None, mycolors=None):
         self.win = None
         self.window = win
+        self.parent = parent
         self.path = path
         self.load_save_folder = os.path.join(path, 'samples')
         self.save_folder = None
@@ -1426,8 +1427,8 @@ class TurtleArtWindow():
     def _import_from_journal(self, blk):
         """ Import a file from the Sugar Journal """
         if self.running_sugar:
-            chooser = ObjectChooser('Choose image', None,
-                       gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT)
+            chooser = ObjectChooser('Choose image', tw.parent,
+                              gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT)
             try:
                 result = chooser.run()
                 if result == gtk.RESPONSE_ACCEPT:
--
cgit v0.9.1