2006-03-03 Martin Hawlisch <Martin.Hawlisch@gmx.de>

* 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

@@ -1,3 +1,9 @@
+2006-03-03  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* 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  <don@gramps-project.org>
 	* src/EditUrl.py: renamed from UrlEdit.py
 	* src/Makefile.am: adapt to module renames

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)
-

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. 

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]