From 3fff5e38b84285a44abbe615b9602e2e80bf9892 Mon Sep 17 00:00:00 2001
From: Michiel Nauta <m.d.nauta@hetnet.nl>
Date: Tue, 1 Feb 2011 12:06:25 +0000
Subject: [PATCH] make context info work for person merge

svn: r16525
---
 src/Merge/mergeperson.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Merge/mergeperson.py b/src/Merge/mergeperson.py
index e55e123fd..20fe01d8e 100644
--- a/src/Merge/mergeperson.py
+++ b/src/Merge/mergeperson.py
@@ -270,7 +270,7 @@ class MergePeople(ManagedWindow.ManagedWindow):
         date = ""
         place = ""
         if handle:
-            event = self.database.db.get_event_from_handle(handle)
+            event = self.database.get_event_from_handle(handle)
             date = DateHandler.get_date(event)
             place = self.place_name(event)
             if date:
@@ -284,7 +284,7 @@ class MergePeople(ManagedWindow.ManagedWindow):
         """Return place name of an event as string."""
         place_id = event.get_place_handle()
         if place_id:
-            place = self.database.db.get_place_from_handle(place_id)
+            place = self.database.get_place_from_handle(place_id)
             return place.get_title()
         else:
             return ""