From bee8f068544568dc96e2ed2c02b8c9c80db008a4 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Fri, 1 Apr 2005 21:51:27 +0000
Subject: [PATCH] * src/AddSpouse.py: remove unused callbacks *
 src/FamilyView.py: remove unused callbacks

svn: r4280
---
 ChangeLog         |  4 ++++
 src/AddSpouse.py  |  7 +------
 src/FamilyView.py | 11 ++---------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a87b78a3..2257feb9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-01  Don Allingham  <don@gramps-project.org>
+	* src/AddSpouse.py: remove unused callbacks
+	* src/FamilyView.py: remove unused callbacks
+
 2005-04-01  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/plugins/TestcaseGenerator.py: Small changes to family generation
 	* src/plugins/StatisticsChart.py: Added statistics for Surnames,
diff --git a/src/AddSpouse.py b/src/AddSpouse.py
index 48de2a536..5c30adbc2 100644
--- a/src/AddSpouse.py
+++ b/src/AddSpouse.py
@@ -68,21 +68,17 @@ class AddSpouse:
     family with the passed person as one spouse, and another person to
     be selected.
     """
-    def __init__(self,parent,db,person,update,addperson,family=None):
+    def __init__(self,parent,db,person,family=None):
         """
         Displays the AddSpouse dialog box.
 
         db - database to which to add the new family
         person - the current person, will be one of the parents
-        update - function that updates the family display
-        addperson - function that adds a person to the person view
         """
         self.parent = parent
         self.db = db
-        self.update = update
         self.person = person
         self.gender = self.person.get_gender()
-        self.addperson = addperson
         self.active_family = family
 
         self.filter_func = self.likely_filter
@@ -289,7 +285,6 @@ class AddSpouse:
         self.db.transaction_commit(trans,_("Add Spouse"))
 
         Utils.destroy_passed_object(obj)
-        self.update(self.active_family)
         m = Marriage.Marriage(self.parent, self.active_family, self.parent.db)
         m.on_add_clicked()
 
diff --git a/src/FamilyView.py b/src/FamilyView.py
index ae9bf97c6..40ac22fc9 100644
--- a/src/FamilyView.py
+++ b/src/FamilyView.py
@@ -663,14 +663,9 @@ class FamilyView:
            if self.person:
                try:
                    if self.selected_spouse:
-                       Marriage.Marriage(
-                           self.parent,self.family,self.parent.db,
-                           self.parent.new_after_edit, self.load_family,
-                           self.parent.source_view.build_tree)
+                       Marriage.Marriage(self.parent,self.family,self.parent.db)
                    else:
                        AddSpouse.AddSpouse(self.parent,self.parent.db,self.person,
-                                           self.load_family,
-                                           self.parent.people_view.redisplay_person_list,
                                            self.family)
                except:
                    DisplayTrace.DisplayTrace()
@@ -679,9 +674,7 @@ class FamilyView:
         if not self.person:
             return
         try:
-            AddSpouse.AddSpouse(self.parent, self.parent.db, self.person,
-                                self.load_family,
-                                self.parent.people_view.redisplay_person_list)
+            AddSpouse.AddSpouse(self.parent, self.parent.db, self.person)
         except:
             DisplayTrace.DisplayTrace()