From ada625adffd3f189ec7fae8cd5e8aef168e0bff8 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sun, 30 Jul 2006 21:29:25 +0000 Subject: [PATCH] * src/plugins/Merge.py: Rename, because Merge module shadows this plugin module. * src/plugins/FindDupes.py: New module, to replace Merge.py; (ShowMatches.on_do_merge_clicked): Use new Merge component. svn: r7096 --- gramps2/ChangeLog | 4 ++++ gramps2/src/plugins/{Merge.py => FindDupes.py} | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) rename gramps2/src/plugins/{Merge.py => FindDupes.py} (99%) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index c6badcdc6..14a76438a 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,8 @@ 2006-07-30 Alex Roitman + * src/plugins/Merge.py: Rename, because Merge module shadows this + plugin module. + * src/plugins/FindDupes.py: New module, to replace Merge.py; + (ShowMatches.on_do_merge_clicked): Use new Merge component. * src/ViewManager.py (ViewManager.do_load_plugins): Catch exception; (ViewManager.plugin_status): Catch exception. diff --git a/gramps2/src/plugins/Merge.py b/gramps2/src/plugins/FindDupes.py similarity index 99% rename from gramps2/src/plugins/Merge.py rename to gramps2/src/plugins/FindDupes.py index bb61430da..94fdb56cd 100644 --- a/gramps2/src/plugins/Merge.py +++ b/gramps2/src/plugins/FindDupes.py @@ -48,7 +48,7 @@ import Utils import soundex import NameDisplay import ListModel -import MergePeople +from Merge import PersonCompare import GrampsDisplay import ManagedWindow from PluginUtils import Tool, register_tool @@ -609,7 +609,7 @@ class ShowMatches(ManagedWindow.ManagedWindow): pn1 = self.db.get_person_from_handle(self.p1) pn2 = self.db.get_person_from_handle(self.p2) - MergePeople.Compare(self.dbstate,self.uistate,pn1,pn2,self.on_update) + PersonCompare(self.dbstate,self.uistate,pn1,pn2,self.on_update) def on_update(self): self.dellist[self.p2] = self.p1