Fix bug in bookmark organiser introduced with commit 14023

svn: r14038

src/Bookmarks.py

@@ -148,7 +148,7 @@ class Bookmarks :
             text.write('<placeholder name="GoToBook">')
             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))

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 \

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)