From 5dff9bb057a8e7858485ddb0773715c8895794d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <forenjunkie@chello.at>
Date: Mon, 6 Feb 2017 23:10:09 +0100
Subject: [PATCH] Close Archiving Preferences Window with ESC

---
 data/gui/archiving_313_preferences_window.ui | 3 ++-
 src/dialogs.py                               | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/data/gui/archiving_313_preferences_window.ui b/data/gui/archiving_313_preferences_window.ui
index c59c442de..994a3a3f9 100644
--- a/data/gui/archiving_313_preferences_window.ui
+++ b/data/gui/archiving_313_preferences_window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkImage" id="add_image">
@@ -43,6 +43,7 @@
     <property name="window_position">center</property>
     <property name="default_width">450</property>
     <signal name="destroy" handler="on_archiving_preferences_window_destroy" swapped="no"/>
+    <signal name="key-press-event" handler="on_key_press_event" swapped="no"/>
     <child>
       <object class="GtkGrid" id="pref_grid">
         <property name="visible">True</property>
diff --git a/src/dialogs.py b/src/dialogs.py
index 06a781146..e5b98bfa2 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -4144,6 +4144,10 @@ class Archiving313PreferencesWindow:
         self.idle_id = GLib.timeout_add_seconds(3, self._nec_archiving_error)
         gajim.connections[self.account].request_archive_preferences()
 
+    def on_key_press_event(self, widget, event):
+        if event.keyval == Gdk.KEY_Escape:
+            self.window.destroy()
+
     def set_widget_state(self, state):
         for widget in ('default_cb', 'save_button', 'add_button',
             'remove_button'):