Merged trunk r18499 through r18539 into geps023.

Conflicts resolved in:
    gramps.pot


svn: r18540
This commit is contained in:
Tim G L Lyons
2011-12-02 00:10:04 +00:00
12 changed files with 6047 additions and 6515 deletions

View File

@@ -240,10 +240,10 @@ class PedigreeGramplet(Gramplet):
self.gui.buffer.set_text("")
active_handle = self.get_active('Person')
active_person = self.dbstate.db.get_person_from_handle(active_handle)
if not active_person:
yield False
#no wrap in Gramplet
self.no_wrap()
if active_person is None:
return
self.process_person(active_person.handle, 1, "f") # father
self.process_person(active_person.handle, 0, "a") # active #FIXME: should be 1?
self.process_person(active_person.handle, 1, "m") # mother