From 45437abe02f57d3cf567e24473f61ec674e47a01 Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Wed, 23 Aug 2006 16:11:47 +0000
Subject: [PATCH] 2006-08-23  Alex Roitman  <shura@gramps-project.org> 	*
 src/Merge/_MergePerson.py (MergePeopleUI.__init__): Properly 	close managed
 window. 	* src/glade/mergedata.glade: Remove unneeded signal
 connections.

svn: r7246
---
 ChangeLog                 | 5 +++++
 src/Merge/_MergePerson.py | 4 ++--
 src/glade/mergedata.glade | 2 --
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f4ec7341..1770714df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-23  Alex Roitman  <shura@gramps-project.org>
+	* src/Merge/_MergePerson.py (MergePeopleUI.__init__): Properly
+	close managed window.
+	* src/glade/mergedata.glade: Remove unneeded signal connections.
+
 2006-08-22  Alex Roitman  <shura@gramps-project.org>
 	* src/plugins/EventCmp.py: Add proper date sorting.
 
diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py
index 36a2aa073..8fb7aca84 100644
--- a/src/Merge/_MergePerson.py
+++ b/src/Merge/_MergePerson.py
@@ -280,7 +280,7 @@ class MergePeopleUI(ManagedWindow.ManagedWindow):
 
         ret = gtk.RESPONSE_HELP
         while ret == gtk.RESPONSE_HELP:
-            ret = window.run()
+            ret = self.window.run()
         
         if ret == gtk.RESPONSE_OK:
 
@@ -303,7 +303,7 @@ class MergePeopleUI(ManagedWindow.ManagedWindow):
                 merge.merge()
                 if update:
                     update()
-        window.destroy()
+        self.close()
 
     def build_menu_names(self,obj):
         return (_('Merge People'),None)
diff --git a/src/glade/mergedata.glade b/src/glade/mergedata.glade
index 3a00b2e83..f81e989ac 100644
--- a/src/glade/mergedata.glade
+++ b/src/glade/mergedata.glade
@@ -1421,7 +1421,6 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
-	      <signal name="clicked" handler="destroy_passed_object" object="merge_places"/>
 	    </widget>
 	  </child>
 
@@ -1435,7 +1434,6 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="on_merge_places_clicked" object="merge_places"/>
 	    </widget>
 	  </child>