From a0f9a7c5ebfcce568b4f3d9ae4552245d1be45a9 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 22 Apr 2006 04:06:10 +0000 Subject: [PATCH] * src/plugins/FilterEditor.py: fix close arguments * src/plugins/ChangeNames.py: fix close arguments * src/plugins/Merge.py: fix close arguments * src/plugins/ChangeTypes.py: fix close arguments * src/plugins/PatchNames.py: fix close arguments svn: r6411 --- gramps2/ChangeLog | 5 +++++ gramps2/src/plugins/ChangeNames.py | 2 +- gramps2/src/plugins/ChangeTypes.py | 2 +- gramps2/src/plugins/FilterEditor.py | 2 +- gramps2/src/plugins/Merge.py | 2 +- gramps2/src/plugins/PatchNames.py | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index be8cb5d5c..885d292a4 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,9 @@ 2006-04-21 Don Allingham + * src/plugins/FilterEditor.py: fix close arguments + * src/plugins/ChangeNames.py: fix close arguments + * src/plugins/Merge.py: fix close arguments + * src/plugins/ChangeTypes.py: fix close arguments + * src/plugins/PatchNames.py: fix close arguments * src/plugins/Desbrowser.py: check for active person * src/GrampsDb/_ReadXML.py: fix typos * src/PluginUtils/_PluginMgr.py: handle module to description mapping diff --git a/gramps2/src/plugins/ChangeNames.py b/gramps2/src/plugins/ChangeNames.py index 264af11d9..a5370b27d 100644 --- a/gramps2/src/plugins/ChangeNames.py +++ b/gramps2/src/plugins/ChangeNames.py @@ -166,7 +166,7 @@ class ChangeNames(Tool.Tool, ManagedWindow.ManagedWindow): self.db.enable_signals() self.db.request_rebuild() self.parent.bookmarks.redraw() - self.close(obj) + self.close() self.cb() #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/ChangeTypes.py b/gramps2/src/plugins/ChangeTypes.py index 8878081a2..0e1ce0d85 100644 --- a/gramps2/src/plugins/ChangeTypes.py +++ b/gramps2/src/plugins/ChangeTypes.py @@ -156,7 +156,7 @@ class ChangeTypes(Tool.Tool, ManagedWindow.ManagedWindow): # Save options self.options.handler.save_options() - self.close(None) + self.close() #------------------------------------------------------------------------ # diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py index 7f5378d16..aca84795c 100644 --- a/gramps2/src/plugins/FilterEditor.py +++ b/gramps2/src/plugins/FilterEditor.py @@ -556,7 +556,7 @@ class EditFilter: self.filter.set_logical_op(op) self.filterdb.add(self.filter) self.parent.draw_filters() - self.close(obj) + self.close() def on_add_clicked(self,obj): EditRule(self,None,_('Add Rule')) diff --git a/gramps2/src/plugins/Merge.py b/gramps2/src/plugins/Merge.py index 3d6957db1..3a3150b3a 100644 --- a/gramps2/src/plugins/Merge.py +++ b/gramps2/src/plugins/Merge.py @@ -164,7 +164,7 @@ class Merge(Tool.Tool): def on_merge_ok_clicked(self,obj): threshold = self.menu.get_menu().get_active().get_data("v") self.use_soundex = int(self.soundex_obj.get_active()) - self.close(obj) + self.close() self.find_potentials(threshold) self.options.handler.options_dict['threshold'] = threshold diff --git a/gramps2/src/plugins/PatchNames.py b/gramps2/src/plugins/PatchNames.py index 1335826c6..11b4bb297 100644 --- a/gramps2/src/plugins/PatchNames.py +++ b/gramps2/src/plugins/PatchNames.py @@ -320,7 +320,7 @@ class PatchNames(Tool.Tool, ManagedWindow.ManagedWindow): self.db.commit_person(p,self.trans) self.db.transaction_commit(self.trans,_("Extract information from names")) - self.close(obj) + self.close() self.cb(None,1) #------------------------------------------------------------------------