diff options
Diffstat (limited to 'options.cpp')
-rw-r--r-- | options.cpp | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/options.cpp b/options.cpp index 61b32fe..c4bcd7a 100644 --- a/options.cpp +++ b/options.cpp @@ -25,7 +25,7 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP static BOOL CheckStateLoadDB(HWND hwndDlg, int idCtrl, const char* szSetting, BYTE bDef) { - BOOL state = DBGetContactSettingByte(NULL, szModuleName, szSetting, bDef); + BOOL state = DBGetContactSettingByte(NULL, szGPGModuleName, szSetting, bDef); CheckDlgButton(hwndDlg, idCtrl, state); return state; } @@ -33,7 +33,7 @@ static BOOL CheckStateLoadDB(HWND hwndDlg, int idCtrl, const char* szSetting, BY static BOOL CheckStateStoreDB(HWND hwndDlg, int idCtrl, const char* szSetting) { BOOL state = IsDlgButtonChecked(hwndDlg, idCtrl); - DBWriteContactSettingByte(NULL, szModuleName, szSetting, (BYTE)state); + DBWriteContactSettingByte(NULL, szGPGModuleName, szSetting, (BYTE)state); return state; } @@ -44,7 +44,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.cbSize = sizeof(odp); odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG); - odp.pszTitle = szModuleName; + odp.pszTitle = szGPGModuleName; odp.pszGroup = "Services"; odp.pszTab = "Main"; odp.flags=ODPF_BOLDGROUPS; @@ -56,7 +56,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.cbSize = sizeof(odp); odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_BIN); - odp.pszTitle = szModuleName; + odp.pszTitle = szGPGModuleName; odp.pszGroup = "Services"; odp.pszTab = "GnuPG Variables"; odp.flags=ODPF_BOLDGROUPS; @@ -68,7 +68,7 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.cbSize = sizeof(odp); odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_MESSAGES); - odp.pszTitle = szModuleName; + odp.pszTitle = szGPGModuleName; odp.pszGroup = "Services"; odp.pszTab = "Messages"; odp.flags=ODPF_BOLDGROUPS; @@ -143,22 +143,22 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA TCHAR *tmp = mir_a2t((char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0)); ListView_SetItemText(hwndList, iRow, 4, tmp); mir_free(tmp); - tmp2 = UniGetContactSettingUtf(hContact, szModuleName, "KeyID", ""); + tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", ""); tmp = mir_a2t(tmp2); mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 1, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); - tmp2 = UniGetContactSettingUtf(hContact, szModuleName, "KeyMainName", ""); + tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", ""); tmp = mir_a2t(tmp2); mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 2, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); - tmp2 = UniGetContactSettingUtf(hContact, szModuleName, "KeyMainEmail", ""); + tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", ""); tmp = mir_a2t(tmp2); mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 3, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); - if(DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0)) + if(DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0)) ListView_SetItemState(hwndList, iRow, 0x2000, 0xF000); user_data[i] = hContact; ZeroMemory(&item,sizeof(item)); @@ -186,12 +186,12 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA TCHAR *ptmp; char *tmp; bool keep = false; - tmp = UniGetContactSettingUtf(user_data[item_num+1], szModuleName, "KeyID", ""); + tmp = UniGetContactSettingUtf(user_data[item_num+1], szGPGModuleName, "KeyID", ""); for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact != NULL; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0)) { if(hContact != user_data[item_num+1]) { - char *tmp2 = UniGetContactSettingUtf(hContact, szModuleName, "KeyID", ""); + char *tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", ""); if(!strcmp(tmp, tmp2)) { mir_free(tmp2); @@ -223,12 +223,12 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA } mir_free(tmp); } - DBDeleteContactSetting(user_data[item_num+1], szModuleName, "KeyID"); - DBDeleteContactSetting(user_data[item_num+1], szModuleName, "GPGPubKey"); - DBDeleteContactSetting(user_data[item_num+1], szModuleName, "KeyMainName"); - DBDeleteContactSetting(user_data[item_num+1], szModuleName, "KeyType"); - DBDeleteContactSetting(user_data[item_num+1], szModuleName, "KeyMainEmail"); - DBDeleteContactSetting(user_data[item_num+1], szModuleName, "KeyComment"); + DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyID"); + DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "GPGPubKey"); + DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyMainName"); + DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyType"); + DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyMainEmail"); + DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyComment"); ListView_SetItemText(hwndList, item_num, 3, _T("not set")); ListView_SetItemText(hwndList, item_num, 2, _T("not set")); ListView_SetItemText(hwndList, item_num, 1, _T("not set")); @@ -249,7 +249,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA delete [] tmp; wstring str; { - TCHAR *tmp = UniGetContactSettingUtf(user_data[item_num+1], szModuleName, "GPGPubKey", _T("")); + TCHAR *tmp = UniGetContactSettingUtf(user_data[item_num+1], szGPGModuleName, "GPGPubKey", _T("")); str.append(tmp); mir_free(tmp); } @@ -275,9 +275,9 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA { int i = hdr->iItem; if(ListView_GetItemState(hwndList, i, 0xF000) == 0x2000) - DBWriteContactSettingByte(user_data[i+1], szModuleName, "GPGEncryption", 1); + DBWriteContactSettingByte(user_data[i+1], szGPGModuleName, "GPGEncryption", 1); else - DBWriteContactSettingByte(user_data[i+1], szModuleName, "GPGEncryption", 0); + DBWriteContactSettingByte(user_data[i+1], szGPGModuleName, "GPGEncryption", 0); item_num = hdr->iItem; } } @@ -305,10 +305,10 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_INITDIALOG: { TranslateDialogDefault(hwndDlg); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("gpg2.exe")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("gpg2.exe")); SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp); mir_free(tmp); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("gpg")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("gpg")); SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp); mir_free(tmp); return TRUE; @@ -321,13 +321,13 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP { case IDC_SET_BIN_PATH: GetFilePath(_T("Choose gpg2.exe"), "szGpgBinPath", _T("*.exe"), _T("EXE Executables")); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("gpg2.exe")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("gpg2.exe")); SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp); mir_free(tmp); break; case IDC_SET_HOME_DIR: GetFolderPath(_T("Set home diractory"), "szHomePath"); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp); mir_free(tmp); break; @@ -348,11 +348,11 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP { TCHAR tmp[512]; GetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp, 512); - DBWriteContactSettingTString(NULL, szModuleName, "szGpgBinPath", tmp); + DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp); GetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp, 512); while(tmp[_tcslen(tmp)-1] == '\\') tmp[_tcslen(tmp)-1] = '\0'; - DBWriteContactSettingTString(NULL, szModuleName, "szHomePath", tmp); + DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp); return TRUE; } } @@ -371,16 +371,16 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP TranslateDialogDefault(hwndDlg); CheckStateLoadDB(hwndDlg, IDC_APPEND_TAGS, "bAppendTags", 0); { - TCHAR *tmp = UniGetContactSettingUtf(NULL, szModuleName, "szInOpenTag", _T("<GPGdec>")); + TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInOpenTag", _T("<GPGdec>")); SetDlgItemText(hwndDlg, IDC_IN_OPEN_TAG, tmp); mir_free(tmp); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szInCloseTag", _T("</GPGdec>")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInCloseTag", _T("</GPGdec>")); SetDlgItemText(hwndDlg, IDC_IN_CLOSE_TAG, tmp); mir_free(tmp); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szOutOpenTag", _T("<GPGenc>")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutOpenTag", _T("<GPGenc>")); SetDlgItemText(hwndDlg, IDC_OUT_OPEN_TAG, tmp); mir_free(tmp); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szOutCloseTag", _T("</GPGenc>")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutCloseTag", _T("</GPGenc>")); SetDlgItemText(hwndDlg, IDC_OUT_CLOSE_TAG, tmp); mir_free(tmp); } @@ -413,22 +413,22 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP { TCHAR tmp[128]; GetDlgItemText(hwndDlg, IDC_IN_OPEN_TAG, tmp, 128); - DBWriteContactSettingTString(NULL, szModuleName, "szInOpenTag", tmp); + DBWriteContactSettingTString(NULL, szGPGModuleName, "szInOpenTag", tmp); mir_free(inopentag); inopentag = new TCHAR [_tcslen(tmp)+1]; _tcscpy(inopentag, tmp); GetDlgItemText(hwndDlg, IDC_IN_CLOSE_TAG, tmp, 128); - DBWriteContactSettingTString(NULL, szModuleName, "szInCloseTag", tmp); + DBWriteContactSettingTString(NULL, szGPGModuleName, "szInCloseTag", tmp); mir_free(inclosetag); inclosetag = new TCHAR [_tcslen(tmp)+1]; _tcscpy(inclosetag, tmp); GetDlgItemText(hwndDlg, IDC_OUT_OPEN_TAG, tmp, 128); - DBWriteContactSettingTString(NULL, szModuleName, "szOutOpenTag", tmp); + DBWriteContactSettingTString(NULL, szGPGModuleName, "szOutOpenTag", tmp); mir_free(outopentag); outopentag = new TCHAR [_tcslen(tmp)+1]; _tcscpy(outopentag, tmp); GetDlgItemText(hwndDlg, IDC_OUT_CLOSE_TAG, tmp, 128); - DBWriteContactSettingTString(NULL, szModuleName, "szOutCloseTag", tmp); + DBWriteContactSettingTString(NULL, szGPGModuleName, "szOutCloseTag", tmp); mir_free(outclosetag); outclosetag = new TCHAR [_tcslen(tmp)+1]; _tcscpy(outclosetag, tmp); @@ -457,7 +457,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP case WM_INITDIALOG: { TranslateDialogDefault(hwndDlg); - tmp = UniGetContactSettingUtf(hContact, szModuleName, "GPGPubKey", _T("")); + tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T("")); wstring str = tmp; mir_free(tmp); wstring::size_type p = 0, stop = 0; @@ -504,7 +504,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP break; } ws2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----")); - DBWriteContactSettingTString(hContact, szModuleName, "GPGPubKey", key_buf.substr(ws1,ws2-ws1).c_str()); + DBWriteContactSettingTString(hContact, szGPGModuleName, "GPGPubKey", key_buf.substr(ws1,ws2-ws1).c_str()); tmp = new TCHAR [key_buf.length()+1]; _tcscpy(tmp, key_buf.substr(ws1,ws2-ws1).c_str()); { //gpg execute block @@ -515,13 +515,13 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DWORD exitcode; { - ptmp = UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")); + ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); _tcscpy(tmp2, ptmp); mir_free(ptmp); _tcscat(tmp2, _T("\\")); _tcscat(tmp2, _T("temporary_exported.asc")); wfstream f(tmp2, std::ios::out); - ptmp = UniGetContactSettingUtf(user_data[item_num+1], szModuleName, "GPGPubKey", _T("")); + ptmp = UniGetContactSettingUtf(user_data[item_num+1], szGPGModuleName, "GPGPubKey", _T("")); wstring str = ptmp; mir_free(ptmp); wstring::size_type s = 0; @@ -542,12 +542,12 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP break; } cp866_to_cp1251(&output); - DBDeleteContactSetting(user_data[item_num+1], szModuleName, "bAlwatsTrust"); + DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "bAlwatsTrust"); { TCHAR *tmp; string::size_type s = output.find("gpg: key ") + strlen("gpg: key "); string::size_type s2 = output.find(":", s); - DBWriteContactSettingString(user_data[item_num+1], szModuleName, "KeyID", output.substr(s,s2-s).c_str()); + DBWriteContactSettingString(user_data[item_num+1], szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str()); tmp = mir_a2t(output.substr(s,s2-s).c_str()); ListView_SetItemText(hwndList_p, item_num, 1, tmp); mir_free(tmp); @@ -555,12 +555,12 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP s = output.find("\"", s2)-1; if(s != s2-1) { - DBWriteContactSettingString(user_data[item_num+1], szModuleName, "KeyType", output.substr(s2,s-s2).c_str()); + DBWriteContactSettingString(user_data[item_num+1], szGPGModuleName, "KeyType", output.substr(s2,s-s2).c_str()); } s+=2; if((s2 = output.find("(", s)) == string::npos) s2 = output.find("<", s); - DBWriteContactSettingString(user_data[item_num+1], szModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str()); + DBWriteContactSettingString(user_data[item_num+1], szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str()); tmp = mir_a2t(output.substr(s,s2-s-1).c_str()); ListView_SetItemText(hwndList_p, item_num, 2, tmp); mir_free(tmp); @@ -569,17 +569,17 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP s2++; if(output[s] == ')') { - DBWriteContactSettingString(user_data[item_num+1], szModuleName, "KeyComment", output.substr(s2,s-s2).c_str()); + DBWriteContactSettingString(user_data[item_num+1], szGPGModuleName, "KeyComment", output.substr(s2,s-s2).c_str()); s+=3; s2 = output.find(">", s); - DBWriteContactSettingString(user_data[item_num+1], szModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str()); + DBWriteContactSettingString(user_data[item_num+1], szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str()); tmp = mir_a2t(output.substr(s,s2-s).c_str()); ListView_SetItemText(hwndList_p, item_num, 3, tmp); mir_free(tmp); } else { - DBWriteContactSettingString(user_data[item_num+1], szModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str()); + DBWriteContactSettingString(user_data[item_num+1], szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str()); tmp = mir_a2t(output.substr(s2,s-s2).c_str()); ListView_SetItemText(hwndList_p, item_num, 3, tmp); mir_free(tmp); |