diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-10-27 19:54:43 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-10-27 19:54:43 +0300 |
| commit | f3d248034ff8629704e7a76a09b2d565df92c195 (patch) | |
| tree | e68147d6dfe3e40d81c6665cef323178184ceafe /options.cpp | |
| parent | 69c525336f25083947d9f246de16fb83f73ce9d8 (diff) | |
modified: init.cpp
modified: main.cpp
modified: options.cpp
Diffstat (limited to 'options.cpp')
| -rw-r--r-- | options.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/options.cpp b/options.cpp index d2a106b..6acc3e7 100644 --- a/options.cpp +++ b/options.cpp @@ -674,18 +674,18 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP } } } - char *tmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "KeyID_Prescense", ""); - if(tmp[0]) +// char *tmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "KeyID_Prescense", ""); + if(!hcontact_data[hcnt].key_in_prescense.empty()) { char *tmp2 = UniGetContactSettingUtf(hcnt, szGPGModuleName, "KeyID", ""); - if(strlen(tmp2) == 0) + if(!tmp2[0]) { string out; DWORD code; wstring cmd = _T(" --export -a "); - TCHAR *tmp3 = mir_a2t(tmp); - cmd += tmp3; - mir_free(tmp3); +// TCHAR *tmp3 = mir_a2t(tmp); + cmd += toUTF16(hcontact_data[hcnt].key_in_prescense); +// mir_free(tmp3); gpg_execution_params params; pxResult result; params.cmd = &cmd; @@ -723,14 +723,14 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP str.clear(); str.append(tmp3); string msg = "Load Public GPG Key (Key ID: "; - msg += tmp; + msg += hcontact_data[hcnt].key_in_prescense; msg += " found in prescense, and exists in keyring.)"; SetWindowTextA(hwndDlg, msg.c_str()); } else { string msg = "Load Public GPG Key (Key ID: "; - msg += tmp; + msg += hcontact_data[hcnt].key_in_prescense; msg += " found in prescense.)"; SetWindowTextA(hwndDlg, msg.c_str()); EnableWindow(GetDlgItem(hwndDlg, IDC_IMPORT), 1); |