From 4498ee32df52c525cad130913c4b4748042bc3fd Mon Sep 17 00:00:00 2001
From: prculley <paulr2787@gmail.com>
Date: Tue, 20 Dec 2016 16:46:30 -0600
Subject: [PATCH] Fix some Gtk deprecations in Plugin Manager

---
 gramps/gui/plug/_windows.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/gramps/gui/plug/_windows.py b/gramps/gui/plug/_windows.py
index 910c75ced..4d8af6e15 100644
--- a/gramps/gui/plug/_windows.py
+++ b/gramps/gui/plug/_windows.py
@@ -77,6 +77,9 @@ def display_message(message):
     """
     print(message)
 
+RELOAD = 777    # A custom Gtk response_type for the Reload button
+
+
 #-------------------------------------------------------------------------
 #
 # PluginStatus: overview of all plugins
@@ -97,12 +100,13 @@ class PluginStatus(ManagedWindow):
 
         self.__pmgr = GuiPluginManager.get_instance()
         self.__preg = PluginRegister.get_instance()
-        self.set_window(Gtk.Dialog("", uistate.window,
-                                   Gtk.DialogFlags.DESTROY_WITH_PARENT,
-                                   (_('_Close'), Gtk.ResponseType.CLOSE)),
-                        None, self.title)
+        dialog = Gtk.Dialog(title="", transient_for=uistate.window,
+                            destroy_with_parent=True)
+        dialog.add_button(_('_Close'), Gtk.ResponseType.CLOSE)
+        self.set_window(dialog, None, self.title)
+
         self.setup_configs('interface.pluginstatus', 750, 400)
-        self.window.connect('response', self.close)
+        self.window.connect('response', self.__on_dialog_button)
 
         notebook = Gtk.Notebook()
 
@@ -282,9 +286,7 @@ class PluginStatus(ManagedWindow):
         if __debug__:
             # Only show the "Reload" button when in debug mode
             # (without -O on the command line)
-            self.__reload_btn = Gtk.Button(label=_("Reload"))
-            self.window.action_area.add(self.__reload_btn)
-            self.__reload_btn.connect('clicked', self.__reload)
+            self.window.add_button(_("Reload"), RELOAD)
 
         #obtain hidden plugins from the pluginmanager
         self.hidden = self.__pmgr.get_hidden_plugin_ids()
@@ -293,6 +295,12 @@ class PluginStatus(ManagedWindow):
         self.__populate_lists()
         self.list_reg.columns_autosize()
 
+    def __on_dialog_button(self, dialog, response_id):
+        if response_id == Gtk.ResponseType.CLOSE:
+            self.close(dialog)
+        else:   # response_id == RELOAD
+            self.__reload(dialog)
+
     def __refresh_addon_list(self, obj):
         """
         Reloads the addons from the wiki into the list.