From 23c7f9e3f8375d376b9d37df1248a35d6690bf69 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Tue, 12 Jan 2010 00:30:23 +0000 Subject: [PATCH] Fix bug in bookmark organiser introduced with commit 14023 svn: r14038 --- src/Bookmarks.py | 2 +- src/DisplayState.py | 2 +- src/Utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bookmarks.py b/src/Bookmarks.py index d11edf4a3..3b7d953b4 100644 --- a/src/Bookmarks.py +++ b/src/Bookmarks.py @@ -148,7 +148,7 @@ class Bookmarks : text.write('') for item in self.bookmarks.get(): try: - label = self.make_label(item) + label, obj = self.make_label(item) func = self.callback(item) action_id = "BM:%s" % item actions.append((action_id, None, label, None, None, func)) diff --git a/src/DisplayState.py b/src/DisplayState.py index cc7d64b27..0efcaad90 100644 --- a/src/DisplayState.py +++ b/src/DisplayState.py @@ -466,7 +466,7 @@ class DisplayState(gen.utils.Callback): self.status.pop(self.status_id) - name = navigation_label(dbstate.db, nav_type, active_handle) + name, obj = navigation_label(dbstate.db, nav_type, active_handle) # Append relationship to default person if funtionality is enabled. if nav_type == 'Person' and active_handle \ diff --git a/src/Utils.py b/src/Utils.py index d865e3083..1c3596d1b 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -1190,4 +1190,4 @@ def navigation_label(db, nav_type, handle): if label: label = '[%s] %s' % (obj.get_gramps_id(), label) - return label + return (label, obj)