From a3ebb970273be8cab64bfe4f62b505c2daf1792d Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 1 Mar 2004 04:56:50 +0000 Subject: [PATCH] * src/gramps_main.py: remove local media concept * src/RelLib.py: remove local media concept * src/SelectObject.py: remove local media concept * src/MediaView.py: remove local media concept * src/EditSource.py: remove local media concept * src/GrampsParser.py: remove local media concept * src/AddMedia.py: remove local media concept * src/GrampsZODB.py: delete svn: r2943 --- gramps2/ChangeLog | 10 ++++++++++ gramps2/src/RelLib.py | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index dca7a9d80..32a60ae64 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,13 @@ +2004-02-29 Don Allingham + * src/gramps_main.py: remove local media concept + * src/RelLib.py: remove local media concept + * src/SelectObject.py: remove local media concept + * src/MediaView.py: remove local media concept + * src/EditSource.py: remove local media concept + * src/GrampsParser.py: remove local media concept + * src/AddMedia.py: remove local media concept + * src/GrampsZODB.py: delete + 2004-02-29 Alex Roitman * src/docgen/LPRDoc.py: Add to CVS. * src/docgen/AsciiDoc.py: Correctly treat cells with span>1. diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 20b053b2c..7710542d8 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -614,8 +614,12 @@ class MediaObject(SourceNote): self.source_list, self.note) def unserialize(self,data): - (self.id, self.thumb, self.path, self.mime, self.desc, self.attrlist, - self.source_list, self.note) = data + try: + (self.id, self.path, self.mime, self.desc, self.attrlist, + self.source_list, self.note) = data + except: + (self.id, junk, self.path, self.mime, self.desc, self.attrlist, + self.source_list, self.note) = data def set_thumbnail(self,thumb): """set the thumbnail"""