Rework Preferences Dialog

gajim/config.py

@@ -89,9 +89,6 @@ class PreferencesWindow:
         """
         del app.interface.instances['preferences']
 
-    def on_close_button_clicked(self, widget):
-        self.window.destroy()
-
     def __init__(self):
         """
         Initialize Preferences window
@@ -519,17 +516,13 @@ class PreferencesWindow:
         self.sounds_preferences = None
 
         self.notebook.set_current_page(0)
-        self.xml.get_object('close_button').grab_focus()
 
         self.window.show_all()
         gtkgui_helpers.possibly_move_window_in_current_desktop(self.window)
 
-    def on_preferences_notebook_switch_page(self, widget, page, page_num):
-        GLib.idle_add(self.xml.get_object('close_button').grab_focus)
-
     def on_preferences_window_key_press_event(self, widget, event):
         if event.keyval == Gdk.KEY_Escape:
-            self.window.hide()
+            self.window.destroy()
 
     def get_per_account_option(self, opt):
         """