diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index 81bb7ad10..3dc48148a 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -42,6 +42,9 @@ import gtk.glade import gnome import gnome.ui +# +# SUSE calls the gconf module "gnome.gconf" +# try: import gconf except ImportError: diff --git a/src/Relationship.py b/src/Relationship.py index 8e3d99a2b..ed56fb5b5 100644 --- a/src/Relationship.py +++ b/src/Relationship.py @@ -218,8 +218,11 @@ def get_relationship(orig_person,other_person): if is_spouse(orig_person,other_person): return ("spouse",[]) - apply_filter(orig_person,0,firstList,firstMap) - apply_filter(other_person,0,secondList,secondMap) + try: + apply_filter(orig_person,0,firstList,firstMap) + apply_filter(other_person,0,secondList,secondMap) + except RuntimeError,msg: + return (_("Relationship loop detected"),None) for person in firstList: if person in secondList: diff --git a/src/gramps_main.py b/src/gramps_main.py index e4fe938e4..ee8679ec3 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -1366,8 +1366,11 @@ class Gramps: self.active_person) if name: - return _("%(relationship)s of %(person)s") % { - 'relationship' : name, 'person' : pname } + if plist == None: + return name + else: + return _("%(relationship)s of %(person)s") % { + 'relationship' : name, 'person' : pname } else: return "" except: