Fixed handling of multiple marriages and add a new person in the AddSpouse dialog

svn: r1035

gramps/src/QuickAdd.py

@@ -47,10 +47,10 @@ class QuickAdd:
         surname = self.xml.get_widget("surname").get_text()
         given = self.xml.get_widget("given").get_text()
         person = RelLib.Person()
-        self.db.addPerson(person)
         name = person.getPrimaryName()
         name.setSurname(surname)
         name.setFirstName(given)
+        self.db.addPerson(person)
         if self.xml.get_widget("male").get_active():
             person.setGender(RelLib.Person.male)
             self.father = person

gramps/src/gramps_main.py

@@ -1296,7 +1296,7 @@ class Gramps:
                 sname = self.parent_name(f.getMother())
             else:
                 sname = self.parent_name(f.getFather())
-            c = self.list_item(sname,f)
+            c = self.list_item(sname,f.getId())
             list.append(c)
             if f == self.active_family or sel == None:
                 sel = c