Update

svn: r2875

src/EditPerson.py

@@ -414,6 +414,7 @@ class EditPerson:
     def close_child_windows(self):
         for child_window in self.child_windows:
             child_window.close(None)
+        self.child_windows = []
 
     def close(self,ok=0):
         self.gallery.close(ok)

src/NameEdit.py

@@ -131,18 +131,17 @@ class NameEditor:
 
     def on_delete_event(self,obj,b):
         self.close_child_windows()
-        self.parent.child_windows.remove(self)
         self.remove_itself_from_menu()
 
     def close(self,obj):
         self.close_child_windows()
-        self.parent.child_windows.remove(self)
         self.remove_itself_from_menu()
-	Utils.destroy_passed_object(self.window)
+        self.window.destroy()
 
     def close_child_windows(self):
         for child_window in self.child_windows:
             child_window.close(None)
+        self.child_windows = []
 
     def add_itself_to_menu(self):
         if not self.name:
@@ -202,7 +201,7 @@ class NameEditor:
         self.parent.lists_changed = 1
 
         self.callback(self.name)
-        Utils.destroy_passed_object(obj)
+        self.close(obj)
 
     def update_name(self,first,last,suffix,title,type,note,format,priv):
         

src/Sources.py

@@ -297,13 +297,13 @@ class SourceEditor:
 
     def close(self,obj):
         self.close_child_windows()
-        self.parent.parent.child_windows.remove(self)
         self.remove_itself_from_menu()
         Utils.destroy_passed_object(self.sourceDisplay)
 
     def close_child_windows(self):
         for child_window in self.child_windows:
             child_window.close()
+        self.child_windows = []
 
     def add_itself_to_menu(self):
         if self.active_source:
@@ -329,7 +329,7 @@ class SourceEditor:
         self.parent_menu_item.destroy()
 
     def present(self,obj):
-        self.window.present()
+        self.sourceDisplay.present()
 
     def on_help_clicked(self,obj):
         """Display the relevant portion of GRAMPS manual"""