diff options
author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-09-11 17:39:26 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-09-11 17:39:26 +0300 |
commit | ce5c8cbc5632891613ccd653d81deb3742c932a7 (patch) | |
tree | 7d74e82dce6606fdda285705908b4de4949fe777 /main.cpp | |
parent | 6b1b91acffcc90db9f6d8e0c466d44e2a6819dc3 (diff) |
modified: main.cpp
modified: options.cpp
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -436,7 +436,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP switch (LOWORD(wParam)) { case IDC_SET_BIN_PATH: - GetFilePath(_T("Choose gpg2.exe"), "szGpgBinPath", _T("*.exe"), _T("EXE Executables")); + GetFilePath(_T("Choose gpg.exe"), "szGpgBinPath", _T("*.exe"), _T("EXE Executables")); tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("gpg.exe")); SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp); mir_free(tmp); @@ -1224,7 +1224,10 @@ void ImportKey() string::size_type s2 = output.find(":", s); DBWriteContactSettingString(hContact, szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str()); s2+=2; - s = output.find("“", s2)+1; + s = output.find("“", s2); + if(s == string::npos) + s = output.find("\"", s2); + s+=1; if(s != s2-1) DBWriteContactSettingString(hContact, szGPGModuleName, "KeyType", output.substr(s2,s-s2).c_str()); s+=2; |