Merge changes made in gramps20 into HEAD

svn: r4549
2005-05-11 14:04:47 +00:00
parent 90a4d68cef
commit 2a77676b36
111 changed files with 42212 additions and 31765 deletions
--- a/src/DbPrompter.py
+++ b/src/DbPrompter.py
@@ -313,7 +313,7 @@ class ImportDbPrompter:
            elif filetype == const.app_gramps_xml:
                choose.destroy()
                import ReadXML
-                ReadXML.importData(self.parent.db,filename)
+                ReadXML.importData(self.parent.db,filename,self.parent.update_bar)
                return True
            elif filetype == const.app_gedcom:
                choose.destroy()