Merge branch 'new_gpg' into new_gpg_autoexchange

1 files changed, 6 insertions, 0 deletions

diff --git a/messages.cpp b/messages.cpp
index c4c804c..4f058b2 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -885,6 +885,7 @@ static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, L
   {
   case WM_INITDIALOG:
     {
+		SetWindowPos(hwndDlg, 0, key_password_rect.left, key_password_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
 		TranslateDialogDefault(hwndDlg);
 		string questionstr = "Please enter password for key with ID: ";
 		questionstr += inkeyid;
@@ -954,6 +955,11 @@ static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, L
 	  DestroyWindow(hwndDlg);
 	  break;
   case WM_DESTROY:
+	  {
+		  GetWindowRect(hwndDlg, &key_password_rect);
+		  DBWriteContactSettingDword(NULL, szGPGModuleName, "PasswordWindowX", key_password_rect.left);
+		  DBWriteContactSettingDword(NULL, szGPGModuleName, "PasswordWindowY", key_password_rect.top);
+	  }
 	  break;
 
   }