diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 3203efe2c..21266e186 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2005-05-19 Alex Roitman + * src/MergePeople.py (merge_family_pair): Properly use handles. + 2005-05-19 Martin Hawlisch * src/GenericFilter.py: Catch invalid input in some filters; (old_names_2_class): Add one name for full 1.0.11 compatibility; diff --git a/gramps2/src/MergePeople.py b/gramps2/src/MergePeople.py index ede49806d..6148a25b0 100644 --- a/gramps2/src/MergePeople.py +++ b/gramps2/src/MergePeople.py @@ -391,13 +391,13 @@ class MergePeople: if child_handle not in tgt_family.get_child_handle_list(): child = self.db.get_person_from_handle(child_handle) parents = child.get_parent_family_handle_list() - tgt_family.add_child_handle(child) - if child.get_main_parents_family_handle() == src_family: - child.set_main_parent_family_handle(tgt_family) + tgt_family.add_child_handle(child_handle) + if child.get_main_parents_family_handle() == src_family.get_handle(): + child.set_main_parent_family_handle(tgt_family.get_handle()) i = 0 for fam in parents[:]: if fam[0] == src_family.get_handle(): - parents[i] = (tgt_family,fam[1],fam[2]) + parents[i] = (tgt_family.get_handle(),fam[1],fam[2]) i += 1 self.db.commit_person(child,trans)