From d8def400f302c64b3639d3f7093a322612f935a0 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Sat, 11 Oct 2003 02:22:51 +0000
Subject: [PATCH] * src/gramps_main.py: fix reference paths *
 src/PeopleView.py: remove gobject import * src/FamilyView.py: return name
 prefix/surname tuple * Makefile.am: installation path from grampslib.so

svn: r2224
---
 gramps2/src/FamilyView.py  | 4 ++--
 gramps2/src/PeopleView.py  | 1 -
 gramps2/src/gramps_main.py | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py
index 804db6620..7ce39bc40 100644
--- a/gramps2/src/FamilyView.py
+++ b/gramps2/src/FamilyView.py
@@ -1064,7 +1064,7 @@ class FamilyView:
             if f:
                 pname = f.getPrimaryName()
                 return (pname.getSurnamePrefix(),pname.getSurname())
-        return ""
+        return ("","")
 
     def no_name(self,val):
         return ("","")
@@ -1074,7 +1074,7 @@ class FamilyView:
             father = self.family.getFather()
             mother = self.family.getMother()
             if not father or not mother:
-                return ""
+                return ("","")
             fsn = father.getPrimaryName().getSurname()
             msn = mother.getPrimaryName().getSurname()
             if not father or not mother:
diff --git a/gramps2/src/PeopleView.py b/gramps2/src/PeopleView.py
index 2cd78a934..1ec592fc7 100644
--- a/gramps2/src/PeopleView.py
+++ b/gramps2/src/PeopleView.py
@@ -31,7 +31,6 @@ from gettext import gettext as _
 # gtk
 #
 #-------------------------------------------------------------------------
-import gobject
 import gtk
 import gtk.glade
 
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index d84f57917..1ef7a7b1a 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -875,7 +875,7 @@ class Gramps:
 
     def import_tool_callback(self):
         Utils.modified()
-        self.clear_person_tabs()
+        self.people_view.clear_person_tabs()
         if not self.active_person:
             self.change_active_person(self.find_initial_person())
         self.goto_active_person()
@@ -1485,7 +1485,7 @@ class Gramps:
         self.load_person(self.active_person)
 
     def update_person_list(self,person):
-        self.add_to_person_list(person,0)
+        self.people_view.add_to_person_list(person,0)
     
     def load_new_person(self,obj):
         self.active_person = RelLib.Person()
@@ -1616,6 +1616,7 @@ class Gramps:
                 return ""
         except:
             DisplayTrace.DisplayTrace()
+            return ""
 	
     def on_open_activate(self,obj):
         if Utils.wasModified():