From 515e648d7b334571c7831a638e9e59934c85ada3 Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Sat, 29 Aug 2015 10:10:48 +0200
Subject: [PATCH] keystore_server: Use B_CLOSE_ON_ESCAPE in request dialogs.

Instead of doing it manually.
---
 src/servers/keystore/AppAccessRequestWindow.cpp | 17 ++---------------
 src/servers/keystore/AppAccessRequestWindow.h   |  2 --
 src/servers/keystore/KeyRequestWindow.cpp       | 17 ++---------------
 src/servers/keystore/KeyRequestWindow.h         |  2 --
 4 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/servers/keystore/AppAccessRequestWindow.cpp b/src/servers/keystore/AppAccessRequestWindow.cpp
index c05b29b006..b4edf58263 100644
--- a/src/servers/keystore/AppAccessRequestWindow.cpp
+++ b/src/servers/keystore/AppAccessRequestWindow.cpp
@@ -144,7 +144,8 @@ AppAccessRequestWindow::AppAccessRequestWindow(const char* keyringName,
 	:
 	BWindow(BRect(50, 50, 100, 100), B_TRANSLATE("Application keyring access"),
 		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
-			| B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS),
+			| B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS
+			| B_CLOSE_ON_ESCAPE),
 	fRequestView(NULL),
 	fDoneSem(-1),
 	fResult(kMessageDisallow)
@@ -175,20 +176,6 @@ AppAccessRequestWindow::~AppAccessRequestWindow()
 }
 
 
-void
-AppAccessRequestWindow::DispatchMessage(BMessage* message, BHandler* handler)
-{
-	int8 key;
-	if (message->what == B_KEY_DOWN
-		&& message->FindInt8("byte", 0, &key) == B_OK
-		&& key == B_ESCAPE) {
-		PostMessage(kMessageDisallow);
-	}
-
-	BWindow::DispatchMessage(message, handler);
-}
-
-
 void
 AppAccessRequestWindow::MessageReceived(BMessage* message)
 {
diff --git a/src/servers/keystore/AppAccessRequestWindow.h b/src/servers/keystore/AppAccessRequestWindow.h
index e8fbee8a5b..d8f952a1d2 100644
--- a/src/servers/keystore/AppAccessRequestWindow.h
+++ b/src/servers/keystore/AppAccessRequestWindow.h
@@ -23,8 +23,6 @@ public:
 										bool appWasUpdated);
 virtual								~AppAccessRequestWindow();
 
-virtual	void						DispatchMessage(BMessage* message,
-										BHandler* handler);
 virtual	void						MessageReceived(BMessage* message);
 
 		status_t					RequestAppAccess(bool& allowAlways);
diff --git a/src/servers/keystore/KeyRequestWindow.cpp b/src/servers/keystore/KeyRequestWindow.cpp
index 2105a8caf7..bbad08d2f3 100644
--- a/src/servers/keystore/KeyRequestWindow.cpp
+++ b/src/servers/keystore/KeyRequestWindow.cpp
@@ -154,7 +154,8 @@ KeyRequestWindow::KeyRequestWindow()
 	:
 	BWindow(BRect(50, 50, 100, 100), B_TRANSLATE("Unlock keyring"),
 		B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS
-			| B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS),
+			| B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS
+			| B_CLOSE_ON_ESCAPE),
 	fRequestView(NULL),
 	fDoneSem(-1),
 	fResult(B_ERROR)
@@ -184,20 +185,6 @@ KeyRequestWindow::~KeyRequestWindow()
 }
 
 
-void
-KeyRequestWindow::DispatchMessage(BMessage* message, BHandler* handler)
-{
-	int8 key;
-	if (message->what == B_KEY_DOWN
-		&& message->FindInt8("byte", 0, &key) == B_OK
-		&& key == B_ESCAPE) {
-		PostMessage(kMessageCancel);
-	}
-
-	BWindow::DispatchMessage(message, handler);
-}
-
-
 void
 KeyRequestWindow::MessageReceived(BMessage* message)
 {
diff --git a/src/servers/keystore/KeyRequestWindow.h b/src/servers/keystore/KeyRequestWindow.h
index 8c535d6e78..a9336abb9e 100644
--- a/src/servers/keystore/KeyRequestWindow.h
+++ b/src/servers/keystore/KeyRequestWindow.h
@@ -18,8 +18,6 @@ public:
 									KeyRequestWindow();
 virtual								~KeyRequestWindow();
 
-virtual	void						DispatchMessage(BMessage* message,
-										BHandler* handler);
 virtual	void						MessageReceived(BMessage* message);
 
 		status_t					RequestKey(const BString& keyringName,