From 5b602a453189e8aa67468011044d46e441d7a6c6 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 17 Dec 2004 04:16:20 +0000 Subject: [PATCH] * src/PeopleModel.py: Fixed rebuild_display * src/ReadXML.py: Fixed calendar handling svn: r3813 --- gramps2/src/PeopleModel.py | 5 +++-- gramps2/src/ReadXML.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gramps2/src/PeopleModel.py b/gramps2/src/PeopleModel.py index fbd09e77e..ec6c5ab7c 100644 --- a/gramps2/src/PeopleModel.py +++ b/gramps2/src/PeopleModel.py @@ -74,8 +74,9 @@ class PeopleModel(gtk.GenericTreeModel): self.top_visible = {} self.rebuild_data(data_filter) - def rebuild_data(self,data_filter): - self.data_filter = data_filter + def rebuild_data(self,data_filter=None): + if data_filter: + self.data_filter = data_filter temp_top_path2iter = [] temp_iter2path = {} temp_path2iter = {} diff --git a/gramps2/src/ReadXML.py b/gramps2/src/ReadXML.py index 531153455..91e8a4c60 100644 --- a/gramps2/src/ReadXML.py +++ b/gramps2/src/ReadXML.py @@ -1052,7 +1052,7 @@ class GrampsParser: d = 0 if attrs.has_key("cformat"): - cal = Date.Date.calendar.index(attrs['calendar']) + cal = Date.Date.calendar_names.index(attrs['calendar']) else: cal = Date.CAL_GREGORIAN