Merge changes from gramps20 made since 2.0.5

svn: r5105
2005-08-18 05:58:28 +00:00
parent b9f4134fdd
commit 704e0c4787
111 changed files with 31121 additions and 20132 deletions
--- a/src/SelectObject.py
+++ b/src/SelectObject.py
@ -123,7 +123,10 @@ class SelectObject:
        self.preview.set_from_pixbuf(image)
        
        self.object_handle.set_text(obj.get_gramps_id())
-        self.object_type.set_text(the_type)
+        if the_type:
+            self.object_type.set_text(the_type)
+        else:
+            self.object_type.set_text("")
        self.object_desc.set_text(obj.get_description())
        if len(path) == 0:
            self.object_path.set_text(_("The file no longer exists"))