From a8b10d10920b6d657df79c8789ec7362d41ba1d6 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Thu, 11 Oct 2007 12:58:16 +0000
Subject: [PATCH] 2007-10-11  Don Allingham  <don@gramps-project.org> 	*
 src/gen/db/base.py: 	* src/GrampsDb_GrampsDbWriteXML.py: 	*
 src/gen/db/__init__.py: fix callback call

svn: r9140
---
 ChangeLog                         | 5 +++++
 src/GrampsDb/_GrampsDbWriteXML.py | 2 +-
 src/gen/db/__init__.py            | 2 +-
 src/gen/db/base.py                | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ffedf764..654083306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-11  Don Allingham  <don@gramps-project.org>
+	* src/gen/db/base.py:
+	* src/GrampsDb_GrampsDbWriteXML.py:
+	* src/gen/db/__init__.py: fix callback call
+
 2007-10-10 Duarte Loreto <happyguy_pt@hotmail.com>
 	* src/DateHandler/_Date_pt.py: portugese datehandler accompanying translation
 	* po/POTFILES.in: new file in POTFILE
diff --git a/src/GrampsDb/_GrampsDbWriteXML.py b/src/GrampsDb/_GrampsDbWriteXML.py
index ad9406376..fefd051e0 100644
--- a/src/GrampsDb/_GrampsDbWriteXML.py
+++ b/src/GrampsDb/_GrampsDbWriteXML.py
@@ -59,7 +59,7 @@ from gen.db.dbconst import \
      MEDIA_KEY,PLACE_KEY,REPOSITORY_KEY,NOTE_KEY
  
 from gen.db.exceptions import *
-from gen.db.longop import LongOpStatus
+from gen.utils.longop import LongOpStatus
 
 import gen.proxy
 
diff --git a/src/gen/db/__init__.py b/src/gen/db/__init__.py
index a4deeb7f6..b4bb045ef 100644
--- a/src/gen/db/__init__.py
+++ b/src/gen/db/__init__.py
@@ -21,7 +21,7 @@
 __version__ = "$Revision: $"
 
 from base import *
-from callback import *
+#from callback import *
 from cursor import *
 from dbconst import *
 from dbdir import *
diff --git a/src/gen/db/base.py b/src/gen/db/base.py
index 1df4b31e0..2ab3191d1 100644
--- a/src/gen/db/base.py
+++ b/src/gen/db/base.py
@@ -51,7 +51,7 @@ LOG = logging.getLogger(".GrampsDb")
 #
 #-------------------------------------------------------------------------
 from gen.lib import *
-from callback import GrampsDBCallback
+from gen.utils.callback import GrampsDBCallback
 from iterator import CursorIterator
 
 #-------------------------------------------------------------------------