From 9bf7f3a5e1ca6d3cec083c00f5cbf29fc5265020 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Wed, 5 May 2004 03:54:02 +0000
Subject: [PATCH] * src/gramps_main.py: rebuild tree after importing *
 src/plugins/ReadGedcom.py: destroy filechooser at proper time

svn: r3129
---
 ChangeLog                 | 4 ++++
 src/DbPrompter.py         | 2 +-
 src/gramps_main.py        | 6 ++++--
 src/plugins/ReadGedcom.py | 6 ++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b75f737c5..c8334e080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-04  Don Allingham  <donaldallingham@users.sourceforge.net>
+	* src/gramps_main.py: rebuild tree after importing
+	* src/plugins/ReadGedcom.py: destroy filechooser at proper time
+
 2004-05-04  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/plugins/DetDescendantReport.py (get_xpm_image): Remove 
 	function, import it from Utils.py instead.
diff --git a/src/DbPrompter.py b/src/DbPrompter.py
index a054eba61..fca3630d3 100644
--- a/src/DbPrompter.py
+++ b/src/DbPrompter.py
@@ -67,7 +67,7 @@ class DbPrompter:
             "on_open_cancel_clicked" : gtk.main_quit,
             "on_opendb_delete_event": gtk.main_quit,
             })
-        
+
         self.new = opendb.get_widget("new")
         if self.want_new:
             self.new.set_active(1)
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 5bd72d076..db01abd33 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -941,13 +941,15 @@ class Gramps:
             self.import_tool_callback()
 
     def import_tool_callback(self):
+        self.people_view.build_tree()
         if Utils.wasHistory_broken():
             self.clear_history()
 	    Utils.clearHistory_broken()
-        self.full_update()
-        self.goto_active_person()
+        self.people_view.apply_filter()
         if not self.active_person:
             self.change_active_person(self.find_initial_person())
+        else:
+            self.goto_active_person()
             
     def full_update(self):
         """Brute force display update, updating all the pages"""
diff --git a/src/plugins/ReadGedcom.py b/src/plugins/ReadGedcom.py
index 93d89112f..b35a3fc89 100644
--- a/src/plugins/ReadGedcom.py
+++ b/src/plugins/ReadGedcom.py
@@ -1768,15 +1768,17 @@ def readData(database,active_person,cb):
     choose.add_filter(filter)
 
     response = choose.run()
-    choose.destroy()
     if response == gtk.RESPONSE_OK:
         filename = choose.get_filename()
+        choose.destroy()
         try:
             importData(db,filename)
         except:
             import DisplayTrace
             DisplayTrace.DisplayTrace()
-
+    else:
+        choose.destroy()
+        
 #-------------------------------------------------------------------------
 #
 #