* 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
This commit is contained in:
		| @@ -1064,7 +1064,7 @@ class FamilyView: | |||||||
|             if f: |             if f: | ||||||
|                 pname = f.getPrimaryName() |                 pname = f.getPrimaryName() | ||||||
|                 return (pname.getSurnamePrefix(),pname.getSurname()) |                 return (pname.getSurnamePrefix(),pname.getSurname()) | ||||||
|         return "" |         return ("","") | ||||||
|  |  | ||||||
|     def no_name(self,val): |     def no_name(self,val): | ||||||
|         return ("","") |         return ("","") | ||||||
| @@ -1074,7 +1074,7 @@ class FamilyView: | |||||||
|             father = self.family.getFather() |             father = self.family.getFather() | ||||||
|             mother = self.family.getMother() |             mother = self.family.getMother() | ||||||
|             if not father or not mother: |             if not father or not mother: | ||||||
|                 return "" |                 return ("","") | ||||||
|             fsn = father.getPrimaryName().getSurname() |             fsn = father.getPrimaryName().getSurname() | ||||||
|             msn = mother.getPrimaryName().getSurname() |             msn = mother.getPrimaryName().getSurname() | ||||||
|             if not father or not mother: |             if not father or not mother: | ||||||
|   | |||||||
| @@ -31,7 +31,6 @@ from gettext import gettext as _ | |||||||
| # gtk | # gtk | ||||||
| # | # | ||||||
| #------------------------------------------------------------------------- | #------------------------------------------------------------------------- | ||||||
| import gobject |  | ||||||
| import gtk | import gtk | ||||||
| import gtk.glade | import gtk.glade | ||||||
|  |  | ||||||
|   | |||||||
| @@ -875,7 +875,7 @@ class Gramps: | |||||||
|  |  | ||||||
|     def import_tool_callback(self): |     def import_tool_callback(self): | ||||||
|         Utils.modified() |         Utils.modified() | ||||||
|         self.clear_person_tabs() |         self.people_view.clear_person_tabs() | ||||||
|         if not self.active_person: |         if not self.active_person: | ||||||
|             self.change_active_person(self.find_initial_person()) |             self.change_active_person(self.find_initial_person()) | ||||||
|         self.goto_active_person() |         self.goto_active_person() | ||||||
| @@ -1485,7 +1485,7 @@ class Gramps: | |||||||
|         self.load_person(self.active_person) |         self.load_person(self.active_person) | ||||||
|  |  | ||||||
|     def update_person_list(self,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): |     def load_new_person(self,obj): | ||||||
|         self.active_person = RelLib.Person() |         self.active_person = RelLib.Person() | ||||||
| @@ -1616,6 +1616,7 @@ class Gramps: | |||||||
|                 return "" |                 return "" | ||||||
|         except: |         except: | ||||||
|             DisplayTrace.DisplayTrace() |             DisplayTrace.DisplayTrace() | ||||||
|  |             return "" | ||||||
| 	 | 	 | ||||||
|     def on_open_activate(self,obj): |     def on_open_activate(self,obj): | ||||||
|         if Utils.wasModified(): |         if Utils.wasModified(): | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user