From ac8b4c35f9dbd6621509fa27b221a39876b4093a Mon Sep 17 00:00:00 2001 From: Martin Hawlisch Date: Fri, 3 Mar 2006 08:43:02 +0000 Subject: [PATCH] 2006-03-03 Martin Hawlisch * src/Mime/__init__.py: Honour renamed files * src/Makefile.am: Images have been moved into subdir (makes "make" work again) * src/FamilyView.py (info_string): Done crash is None as handle was given (e.g. no father in family) svn: r6055 --- gramps2/ChangeLog | 6 ++++++ gramps2/src/FamilyView.py | 3 ++- gramps2/src/Makefile.am | 19 +------------------ gramps2/src/Mime/__init__.py | 4 ++-- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index fdc1c9752..0543b1e56 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,9 @@ +2006-03-03 Martin Hawlisch + * src/Mime/__init__.py: Honour renamed files + * src/Makefile.am: Images have been moved into subdir (makes "make" work again) + * src/FamilyView.py (info_string): Done crash is None as handle was + given (e.g. no father in family) + 2006-03-02 Don Allingham * src/EditUrl.py: renamed from UrlEdit.py * src/Makefile.am: adapt to module renames diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index dddb5f9ba..814b98aca 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -442,6 +442,8 @@ class FamilyView(PageView.PersonNavView): def info_string(self,handle): child = self.dbstate.db.get_person_from_handle(handle) + if not child: + return None birth_ref = child.get_birth_ref() death_ref = child.get_death_ref() value = None @@ -594,4 +596,3 @@ class FamilyView(PageView.PersonNavView): def change_to(self,obj,handle): self.dbstate.change_active_handle(handle) - diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index 36ecc63f9..6bbf05d28 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -144,25 +144,8 @@ GLADEFILES = \ rule.glade\ scratchpad.glade -GRAPHICS = \ - logo.png\ - bad.png\ - good.png\ - gramps.png \ - media.png\ - place.png\ - sources.png\ - splash.jpg\ - tools.png \ - land_shallow_topo_2048.jpg \ - land_shallow_topo_350.jpg \ - flist.svg \ - media.svg \ - person.svg \ - relation.svg - # Other stuff that we need to install -dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) +dist_pkgdata_DATA = $(GLADEFILES) # In principle the following rule slightly violates the automake/autoconf # spirit of keeping each subdirectory as a separate entity unto itself. diff --git a/gramps2/src/Mime/__init__.py b/gramps2/src/Mime/__init__.py index b12bd9804..95de6d281 100644 --- a/gramps2/src/Mime/__init__.py +++ b/gramps2/src/Mime/__init__.py @@ -19,9 +19,9 @@ # try: - from GnomeMime import * + from _GnomeMime import * except: - from PythonMime import * + from _PythonMime import * def base_type(val): return val.split('/')[0]