diff options
| -rw-r--r-- | main.cpp | 7 | ||||
| -rw-r--r-- | options.cpp | 5 |
2 files changed, 9 insertions, 3 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; diff --git a/options.cpp b/options.cpp index 9c1dce4..03808ae 100644 --- a/options.cpp +++ b/options.cpp @@ -781,7 +781,10 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP ListView_SetItemText(hwndList_p, item_num, 1, tmp); mir_free(tmp); 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) { tmp2 = new char [output.substr(s2,s-s2).length()+1]; |