From 15491e3ad5e3a58bec4017e422bda41a27d6c099 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 19 Jan 2005 03:31:48 +0000 Subject: [PATCH] * src/RelLib.py (Event.are_equal): Only compare place handles if at least one if them is non-empty. svn: r3935 --- gramps2/ChangeLog | 2 ++ gramps2/src/RelLib.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index bff8abd93..cb0271186 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -29,6 +29,8 @@ * src/dates/Date_ru.py: Add formats and quality. * src/EditPerson.py (get_place): Use "" for empty place's handle. + * src/RelLib.py (Event.are_equal): Only compare place handles if + at least one if them is non-empty. 2005-01-17 Don Allingham * src/ReportUtils.py: Added diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 20a7b0d99..1498645f5 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -1548,7 +1548,8 @@ class Event(PrimaryObject,DataObj): """ if other == None: other = Event (None) - if (self.name != other.name or self.place != other.place or + if (self.name != other.name or + ((self.place or other.place) and (self.place != other.place)) or self.description != other.description or self.cause != other.cause or self.private != other.private or (not self.get_date_object().is_equal(other.get_date_object())) or