diff --git a/ChangeLog b/ChangeLog index cf7a6cba9..d4be4b0c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-10-11 Don Allingham + * src/DisplayState.py: fix callback references + * src/DbState.py: fix callback references + 2007-10-12 Benny Malengier * src/Filters/_FilterParser.py: avoid unknown filters crashing * src/Filters/Rules/Person/__init__.py: remove private filter list and register, not used. diff --git a/src/DbState.py b/src/DbState.py index d49fa053b..4fe11d5ba 100644 --- a/src/DbState.py +++ b/src/DbState.py @@ -25,7 +25,8 @@ Provides the database state class __author__ = "Donald N. Allingham" __revision__ = "$Revision: 8032 $" -from gen.db import GrampsDBCallback, GrampsDbBase +from gen.db import GrampsDbBase +from gen.utils import GrampsDBCallback import Config class DbState(GrampsDBCallback): diff --git a/src/DisplayState.py b/src/DisplayState.py index db8b4ac98..5e7036c3b 100644 --- a/src/DisplayState.py +++ b/src/DisplayState.py @@ -63,7 +63,7 @@ DISABLED = -1 # History manager # #------------------------------------------------------------------------- -class History(gen.db.GrampsDBCallback): +class History(gen.utils.GrampsDBCallback): """ History manages the objects of a certain type that have been viewed, with ability to go back, or forward. When accessing an object, it should be pushed on the History. @@ -75,7 +75,7 @@ class History(gen.db.GrampsDBCallback): } def __init__(self): - gen.db.GrampsDBCallback.__init__(self) + gen.utils.GrampsDBCallback.__init__(self) self.clear() def clear(self): @@ -290,7 +290,7 @@ class WarnHandler(RotateHandler): top.run() top.destroy() -class DisplayState(gen.db.GrampsDBCallback): +class DisplayState(gen.utils.GrampsDBCallback): __signals__ = { 'filters-changed' : (str, ), @@ -306,7 +306,7 @@ class DisplayState(gen.db.GrampsDBCallback): self.uimanager = uimanager self.progress_monitor = progress_monitor self.window = window - gen.db.GrampsDBCallback.__init__(self) + gen.utils.GrampsDBCallback.__init__(self) self.status = status self.status_id = status.get_context_id('GRAMPS') self.progress = progress