From 72b301338f1930fea1d232fc28ff7a65a1ce0db6 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Sat, 21 Aug 2004 03:31:51 +0000
Subject: [PATCH] Update

svn: r3455
---
 gramps2/src/plugins/rel_da.py |  2 +-
 gramps2/src/plugins/rel_de.py |  2 +-
 gramps2/src/plugins/rel_fi.py |  2 +-
 gramps2/src/plugins/rel_fr.py |  2 +-
 gramps2/src/plugins/rel_hu.py | 14 ++++++++++++++
 gramps2/src/plugins/rel_it.py |  2 +-
 gramps2/src/plugins/rel_no.py |  2 +-
 gramps2/src/plugins/rel_ru.py |  2 +-
 gramps2/src/plugins/rel_sv.py |  2 +-
 9 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/gramps2/src/plugins/rel_da.py b/gramps2/src/plugins/rel_da.py
index 120493450..3b609e6e4 100644
--- a/gramps2/src/plugins/rel_da.py
+++ b/gramps2/src/plugins/rel_da.py
@@ -144,7 +144,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person == None:
             return ("undefined",[])
     
-        if orig_person == other_person:
+        if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
         if self.is_spouse(orig_person,other_person):
diff --git a/gramps2/src/plugins/rel_de.py b/gramps2/src/plugins/rel_de.py
index 3a61b3b8f..e4634217d 100644
--- a/gramps2/src/plugins/rel_de.py
+++ b/gramps2/src/plugins/rel_de.py
@@ -335,7 +335,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person == None:
             return ("undefined",[])
     
-        if orig_person == other_person:
+        if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
         if self.is_spouse(orig_person,other_person):
diff --git a/gramps2/src/plugins/rel_fi.py b/gramps2/src/plugins/rel_fi.py
index 9f2a95069..0061d5bf6 100644
--- a/gramps2/src/plugins/rel_fi.py
+++ b/gramps2/src/plugins/rel_fi.py
@@ -179,7 +179,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person == None:
             return ("undefined",[])
     
-        if orig_person == other_person:
+        if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
         if self.is_spouse(orig_person,other_person):
diff --git a/gramps2/src/plugins/rel_fr.py b/gramps2/src/plugins/rel_fr.py
index 5bede2f1e..f8eea0a18 100644
--- a/gramps2/src/plugins/rel_fr.py
+++ b/gramps2/src/plugins/rel_fr.py
@@ -143,7 +143,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person == None:
             return ("undefined",[])
 
-        if orig_person == other_person:
+        if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
         if self.is_spouse(orig_person,other_person):
diff --git a/gramps2/src/plugins/rel_hu.py b/gramps2/src/plugins/rel_hu.py
index 1c8c62079..832c4eb92 100644
--- a/gramps2/src/plugins/rel_hu.py
+++ b/gramps2/src/plugins/rel_hu.py
@@ -262,6 +262,20 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         along with a list of common ancestors (typically father,mother)
         """
 
+        if orig_person == None:
+            return ("undefined",[])
+
+        if orig_person.get_handle() == other_person.get_handle():
+            return ('', [])
+
+        if self.is_spouse(orig_person,other_person):
+            if other_person.get_gender() == RelLib.Person.male:
+                #FIXME: husband
+                return ("spouse",[])
+            else:
+                #FIXME: wife
+                return ("spouse",[])
+
         if self.is_fathermother_in_law(other_person,orig_person):
             if other_person.getGender() == RelLib.Person.male:
                 return ("apósa",self.get_fathermother_in_law_common(other_person,orig_person))
diff --git a/gramps2/src/plugins/rel_it.py b/gramps2/src/plugins/rel_it.py
index 00c4820c3..fcbe129a4 100644
--- a/gramps2/src/plugins/rel_it.py
+++ b/gramps2/src/plugins/rel_it.py
@@ -148,7 +148,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person == None:
             return ("non definito",[])
 
-        if orig_person == other_person:
+        if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
         if self.is_spouse(orig_person,other_person):
diff --git a/gramps2/src/plugins/rel_no.py b/gramps2/src/plugins/rel_no.py
index dac813721..d23073c90 100644
--- a/gramps2/src/plugins/rel_no.py
+++ b/gramps2/src/plugins/rel_no.py
@@ -229,7 +229,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person == None:
             return ("undefined",[])
     
-        if orig_person == other_person:
+        if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
         if self.is_spouse(orig_person,other_person):
diff --git a/gramps2/src/plugins/rel_ru.py b/gramps2/src/plugins/rel_ru.py
index 60e4bfdf4..9158e0cef 100644
--- a/gramps2/src/plugins/rel_ru.py
+++ b/gramps2/src/plugins/rel_ru.py
@@ -204,7 +204,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person == None:
             return ("undefined",[])
     
-        if orig_person == other_person:
+        if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
         if self.is_spouse(orig_person,other_person):
diff --git a/gramps2/src/plugins/rel_sv.py b/gramps2/src/plugins/rel_sv.py
index d2997096b..26764ed1b 100644
--- a/gramps2/src/plugins/rel_sv.py
+++ b/gramps2/src/plugins/rel_sv.py
@@ -184,7 +184,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person == None:
             return ("undefined",[])
     
-        if orig_person == other_person:
+        if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
         if self.is_spouse(orig_person,other_person):