From 95f43374b7154612e8d9e5a1b22e1fd57cd3e071 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Tue, 11 Mar 2008 10:58:54 +0000 Subject: [PATCH] 0001927: renamed glade variable to avoid name collision svn: r10267 --- src/Merge/_MergePerson.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py index 40a457777..28cde0a84 100644 --- a/src/Merge/_MergePerson.py +++ b/src/Merge/_MergePerson.py @@ -286,20 +286,20 @@ class MergePeopleUI(ManagedWindow.ManagedWindow): ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__) - glade = glade.XML(const.MERGE_GLADE, 'merge_people') - window = glade.get_widget('merge_people') + glade_xml = glade.XML(const.MERGE_GLADE, 'merge_people') + window = glade_xml.get_widget('merge_people') - self.set_window(window, glade.get_widget('title'), _("Merge People")) + self.set_window(window, glade_xml.get_widget('title'), _("Merge People")) - p1 = glade.get_widget('person1') - p2 = glade.get_widget('person2') + p1 = glade_xml.get_widget('person1') + p2 = glade_xml.get_widget('person2') n1 = name_of(person1) n2 = name_of(person2) p1.set_label(n1) p2.set_label(n2) - glade.get_widget('help').connect('clicked', self.help) + glade_xml.get_widget('help').connect('clicked', self.help) ret = gtk.RESPONSE_HELP while ret == gtk.RESPONSE_HELP: