modified: main.cpp

	modified:   new_gpg.rc
	modified:   options.cpp
	modified:   resource.h

1 files changed, 6 insertions, 1 deletions

diff --git a/main.cpp b/main.cpp
index c2b8ad5..9f70ea8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -308,10 +308,15 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
     {

 		TranslateDialogDefault(hwndDlg);

 		TCHAR *tmp = UniGetContactSettingUtf(new_key_hcnt, szGPGModuleName, "GPGPubKey", _T(""));

-		SetDlgItemText(hwndDlg, IDC_MESSAGE, (_tcslen(tmp) > 0)?_T("There is existing key for contact, do you want to replace with new key ?"):_T("New public key was received, do you want to import it?"));

+		SetDlgItemText(hwndDlg, IDC_MESSAGE, (_tcslen(tmp) > 0)?_T("There is existing key for contact, would you like to replace with new key ?"):_T("New public key was received, do you want to import it?"));

 		EnableWindow(GetDlgItem(hwndDlg, IDC_IMPORT_AND_USE), DBGetContactSettingByte(new_key_hcnt, szGPGModuleName, "GPGEncryption", 0)?0:1);

 		SetDlgItemText(hwndDlg, ID_IMPORT, (_tcslen(tmp) > 0)?_T("Replace"):_T("Accept"));

 		mir_free(tmp);

+		tmp = new TCHAR [256];

+		_tcscpy(tmp, _T("Received key from "));

+		_tcscat(tmp, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)new_key_hcnt, (LPARAM)GCDNF_TCHAR));

+		SetDlgItemText(hwndDlg, IDC_KEY_FROM, tmp);

+		delete [] tmp;

       return TRUE;

     }