Fixed Pedigree View for new preferred family concept

svn: r856

gramps/src/PedView.py

@@ -382,13 +382,8 @@ class PedigreeView:
 
         if depth > 5 or person == None:
             return
-        family = person.getMainFamily()
-        frel = 0
-        mrel = 0
-        if family == None:
-            l = person.getAltFamilyList()
-            if len(l) > 0:
-                (family,m,f) = l[0]
+        (family,m,f) = person.getMainFamilyRel()
+        if family:
             mrel = (m != "Birth")
             frel = (f != "Birth")
             

gramps/src/RelLib.py

@@ -1120,9 +1120,9 @@ class Person:
         """returns the main Family of the Person, the Family in which the
         Person is a natural born child"""
         if len(self.AltFamilyList) == 0:
-            return None
+            return (None,None,None)
         else:
-            return self.AltFamilyList
+            return self.AltFamilyList[0]
 
     def setNote(self,text):
         """sets the note attached to the Person to the passed text"""