From 2da74564a30ec5b3cf4baf66ee5099a4bd27d9ab Mon Sep 17 00:00:00 2001
From: prculley <paulr2787@gmail.com>
Date: Mon, 30 Jan 2017 09:02:36 -0600
Subject: [PATCH] fix owner editor to properly destroy glade object

---
 gramps/plugins/tool/ownereditor.glade |  1 -
 gramps/plugins/tool/ownereditor.py    | 10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gramps/plugins/tool/ownereditor.glade b/gramps/plugins/tool/ownereditor.glade
index 7a4c3ce06..ae758afa9 100644
--- a/gramps/plugins/tool/ownereditor.glade
+++ b/gramps/plugins/tool/ownereditor.glade
@@ -35,7 +35,6 @@
   <object class="GtkWindow" id="ownereditor">
     <property name="can_focus">False</property>
     <property name="window_position">center</property>
-    <signal name="delete-event" handler="on_delete_event" swapped="no"/>
     <child>
       <object class="GtkEventBox" id="eventbox">
         <property name="visible">True</property>
diff --git a/gramps/plugins/tool/ownereditor.py b/gramps/plugins/tool/ownereditor.py
index 90fab537d..c1bdc523b 100644
--- a/gramps/plugins/tool/ownereditor.py
+++ b/gramps/plugins/tool/ownereditor.py
@@ -113,12 +113,12 @@ class OwnerEditor(tool.Tool, ManagedWindow):
             "on_cancel_button_clicked": self.close,
             "on_help_button_clicked": self.on_help_button_clicked,
             "on_eventbox_button_press_event": self.on_button_press_event,
-            "on_menu_activate": self.on_menu_activate,
-            "on_delete_event"   : self.close,
-            })
+            "on_menu_activate": self.on_menu_activate})
 
         # fetch the popup menu
         self.menu = topDialog.get_object("popup_menu")
+        self.track_ref_for_deletion("menu")
+
         #topDialog.connect_signals({"on_menu_activate": self.on_menu_activate})
 
         # get current db owner and attach it to the entries of the window
@@ -148,6 +148,7 @@ class OwnerEditor(tool.Tool, ManagedWindow):
     def on_ok_button_clicked(self, obj):
         """Update the current db's owner information from editor"""
         self.db.set_researcher(self.owner)
+        self.menu.destroy()
         self.close()
 
     def on_help_button_clicked(self, obj):
@@ -173,6 +174,9 @@ class OwnerEditor(tool.Tool, ManagedWindow):
             for i in range(len(config_keys)):
                 config.set(config_keys[i], self.owner.get()[i])
 
+    def clean_up(self):
+        self.menu.destroy()
+
 #-------------------------------------------------------------------------
 #
 # OwnerEditorOptions (None at the moment)