diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 7188e8483..384549fc3 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2005-09-10 Don Allingham + * src/ImageSelect.py: fix adding a new image that is actually + already in the database. + 2005-09-06 Don Allingham * src/plugins/NavWebPage.py: suppress dates on list pages for restricted people diff --git a/gramps2/configure.in b/gramps2/configure.in index 2156013bf..b19127548 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -4,11 +4,11 @@ dnl Process this file with autoconf to produce a configure script. dnl May need to run automake && aclocal first AC_PREREQ(2.57) -AC_INIT(gramps, 2.0.8, gramps-bugs@lists.sourceforge.net) +AC_INIT(gramps, 2.0.9, gramps-bugs@lists.sourceforge.net) AC_CONFIG_SRCDIR(src/gramps.py) AM_INIT_AUTOMAKE(1.6.3) -dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') -RELEASE=1 +RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') +dnl RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index 54681e08c..b8f952ec3 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -187,7 +187,6 @@ class ImageSelect: already_imported = None - trans = self.db.transaction_begin() for o_id in self.db.get_media_object_handles(): o = self.db.get_object_from_handle(o_id) if o.get_path() == filename: @@ -208,13 +207,14 @@ class ImageSelect: mobj.set_mime_type(mtype) mobj.set_path(filename) else: - trans = self.db.transaction_begin() mobj = RelLib.MediaObject() mobj.set_description(description) mobj.set_mime_type(None) - self.savephoto(mobj,trans) - self.db.transaction_commit(trans,'Edit Media Objects') + if not already_imported: + trans = self.db.transaction_begin() + self.savephoto(mobj,trans) + self.db.transaction_commit(trans,'Edit Media Objects') self.parent.lists_changed = 1 self.load_images() diff --git a/gramps2/src/PeopleView.py b/gramps2/src/PeopleView.py index dc2e9fba3..3fb2823e8 100644 --- a/gramps2/src/PeopleView.py +++ b/gramps2/src/PeopleView.py @@ -134,8 +134,6 @@ class PeopleView: column = gtk.TreeViewColumn(_('Name'), self.renderer,text=0) column.set_resizable(True) - #column.set_clickable(True) - #column.connect('clicked',self.sort_clicked) column.set_min_width(225) column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) self.person_tree.append_column(column)