diff options
| -rwxr-xr-x | options.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/options.cpp b/options.cpp index 5f0c99f..fe81e36 100755 --- a/options.cpp +++ b/options.cpp @@ -358,13 +358,11 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if(OpenClipboard(hwndDlg))
{
char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
- TCHAR *buf = mir_utf8decodeT(szKey);
- mir_free(szKey);
- std::wstring str = buf;
- mir_free(buf); - for(std::wstring::size_type i = str.find(_T("\n")); i != std::wstring::npos; i = str.find(_T("\n"), i+2)) + std::string str = szKey;;
+ mir_free(szKey); + for(std::string::size_type i = str.find(_T("\n")); i != std::string::npos; i = str.find(_T("\n"), i+2)) str.replace(i, 1, _T("\r\n")); - szKey = mir_utf8encodeW(str.c_str()); + szKey = mir_strdup(str.c_str()); str.clear(); EmptyClipboard();
if(!SetClipboardData(CF_OEMTEXT, szKey))
|