diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-10-21 05:34:01 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-10-21 05:34:01 +0300 |
| commit | d5baf212f45c3926ffec3bccad77ca4dd0751d23 (patch) | |
| tree | 4f32bd925082bc78ecdcf0a1e98b53655a8faa69 /options.cpp | |
| parent | 64624c111e4a8a3a156190a8d6d3ee4d2e528f39 (diff) | |
using utf8<->utf16 on poor c++ instead of miranda api (can solve some issues with badly encoded messages, testing needed)
Diffstat (limited to 'options.cpp')
| -rw-r--r-- | options.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/options.cpp b/options.cpp index d49553c..babaad1 100644 --- a/options.cpp +++ b/options.cpp @@ -914,7 +914,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingString(hContact, szGPGModuleName, "KeyID", tmp2); } mir_free(tmp2); - tmp = mir_utf8decodeW(output.substr(s,s2-s).c_str()); + tmp = mir_wstrdup(toUTF16(output.substr(s,s2-s)).c_str()); if(hContact && hwndList_p) ListView_SetItemText(hwndList_p, item_num, 1, tmp); mir_free(tmp); @@ -955,7 +955,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str()); } mir_free(tmp2); - tmp = mir_utf8decodeW(output.substr(s,s2-s-1).c_str()); + tmp = mir_wstrdup(toUTF16(output.substr(s,s2-s-1)).c_str()); if(hContact && hwndList_p) ListView_SetItemText(hwndList_p, item_num, 2, tmp); mir_free(tmp); @@ -1018,7 +1018,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str()); } mir_free(tmp2); - tmp = mir_utf8decodeW(output.substr(s,s2-s).c_str()); + tmp = mir_wstrdup(toUTF16(output.substr(s,s2-s)).c_str()); if(hContact && hwndList_p) ListView_SetItemText(hwndList_p, item_num, 3, tmp); mir_free(tmp); @@ -1050,7 +1050,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str()); } mir_free(tmp2); - tmp = mir_utf8decodeW(output.substr(s2,s-s2).c_str()); + tmp = mir_wstrdup(toUTF16(output.substr(s2,s-s2)).c_str()); if(hContact && hwndList_p) ListView_SetItemText(hwndList_p, item_num, 3, tmp); mir_free(tmp); @@ -1099,7 +1099,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingString(hContact, szGPGModuleName, "GPGPubKey", out.c_str()); } } - tmp = mir_utf8decodeW(output.c_str()); + tmp = mir_wstrdup(toUTF16(output).c_str()); MessageBox(0, tmp, _T(""), MB_OK); mir_free(tmp); DeleteFile(tmp2); |