diff options
| -rw-r--r-- | options.cpp | 12 | ||||
| -rw-r--r-- | utilities.cpp | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/options.cpp b/options.cpp index 6b773d3..f2b658a 100644 --- a/options.cpp +++ b/options.cpp @@ -644,6 +644,11 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP if(metaIsProtoMetaContacts(hcnt))
hcnt = metaGetMostOnline(hcnt);
TranslateDialogDefault(hwndDlg);
+ {
+ string msg = "Load Public GPG Key for ";
+ msg += (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hcnt, 0);
+ SetWindowTextA(hwndDlg, msg.c_str());
+ }
bool isContactSecured(HANDLE);
if(!hcnt)
{
@@ -653,7 +658,10 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP if(isContactSecured(hcnt))
SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, _T("Turn off encryption"));
else
+ {
SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, _T("Turn on encryption"));
+ CheckDlgButton(hwndDlg, IDC_ENABLE_ENCRYPTION, 1);
+ }
if(hcnt)
{
tmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "GPGPubKey", _T(""));
@@ -720,7 +728,9 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP TCHAR *tmp3 = mir_a2t(out.c_str());
str.clear();
str.append(tmp3);
- string msg = "Load Public GPG Key (Key ID: ";
+ string msg = "Load Public GPG Key for ";
+ msg += (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hcnt, 0);
+ msg += " (Key ID: ";
msg += hcontact_data[hcnt].key_in_prescense;
msg += " found in prescense, and exists in keyring.)";
SetWindowTextA(hwndDlg, msg.c_str());
diff --git a/utilities.cpp b/utilities.cpp index 0b49e61..cf64422 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -930,6 +930,8 @@ int returnNoError(HANDLE hContact) { SetEvent( hEvent ); return 777; } +// end from secureim + string toUTF8(wstring str) { |