From 6625610170411e9a5fcd43dfd66436fa12fd43e7 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 16 Aug 2010 20:11:51 +0300 Subject: modified: constants.h modified: gpg_wrapper.cpp modified: init.cpp modified: main.cpp modified: messages.cpp modified: options.cpp modified: utilities.cpp --- main.cpp | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index d49d38d..b3901f6 100644 --- a/main.cpp +++ b/main.cpp @@ -163,13 +163,13 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM { out.erase(s, 1); } - DBWriteContactSettingString(NULL, szModuleName, "GPGPubKey", out.c_str()); + DBWriteContactSettingString(NULL, szGPGModuleName, "GPGPubKey", out.c_str()); } TCHAR passwd[64]; GetDlgItemText(hwndDlg, IDC_KEY_PASSWORD, passwd, 64); if(_tcslen(passwd) > 0) - DBWriteContactSettingTString(NULL, szModuleName, "szKeyPassword", passwd); - DBWriteContactSettingByte(NULL, szModuleName, "FirstRun", 0); + DBWriteContactSettingTString(NULL, szGPGModuleName, "szKeyPassword", passwd); + DBWriteContactSettingByte(NULL, szGPGModuleName, "FirstRun", 0); DestroyWindow(hwndDlg); break; case IDC_OTHER: @@ -225,10 +225,10 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_INITDIALOG: { TranslateDialogDefault(hwndDlg); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T("")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("")); SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp); mir_free(tmp); - tmp = UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp); mir_free(tmp); return TRUE; @@ -241,13 +241,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; @@ -255,11 +255,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); DestroyWindow(hwndDlg); ShowFirstRunDialog(); break; @@ -300,7 +300,7 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam, case WM_INITDIALOG: { TranslateDialogDefault(hwndDlg); - TCHAR *tmp = UniGetContactSettingUtf(new_key_hcnt, szModuleName, "GPGPubKey", _T("")); + TCHAR *tmp = UniGetContactSettingUtf(new_key_hcnt, szGPGModuleName, "GPGPubKey", _T("")); SetDlgItemText(hwndDlg, IDC_MESSAGE, (_tcslen(tmp) > 0)?_T("There is existing key for contact, do you want to replace with new key ?"):_T("New public key was received, do you want to import it?")); mir_free(tmp); return TRUE; @@ -317,7 +317,7 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam, break; case IDC_IMPORT_AND_USE: ImportKey(); - DBWriteContactSettingByte(new_key_hcnt, szModuleName, "GPGEncryption", 1); + DBWriteContactSettingByte(new_key_hcnt, szGPGModuleName, "GPGEncryption", 1); DestroyWindow(hwndDlg); break; case IDC_IGNORE_KEY: @@ -421,7 +421,7 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam, delete [] tmp; } { //generating key file - TCHAR *tmp = UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T("")); + TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("")); char *tmp2;// = mir_t2a(tmp); path = tmp; mir_free(tmp); @@ -838,7 +838,7 @@ void ShowSelectExistingKeyDialog() void FirstRun() { DWORD pid = 0; - if(!DBGetContactSettingByte(NULL, szModuleName, "FirstRun", 1)) + if(!DBGetContactSettingByte(NULL, szGPGModuleName, "FirstRun", 1)) return; ShowSetDirsDialog(); } @@ -851,7 +851,7 @@ void ImportKey() { extern wstring new_key; extern HANDLE new_key_hcnt; - DBWriteContactSettingTString(new_key_hcnt, szModuleName, "GPGPubKey", new_key.c_str()); + DBWriteContactSettingTString(new_key_hcnt, szGPGModuleName, "GPGPubKey", new_key.c_str()); { //gpg execute block wstring cmd; TCHAR tmp2[MAX_PATH] = {0}; @@ -859,13 +859,13 @@ void ImportKey() string output; 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(new_key_hcnt, szModuleName, "GPGPubKey", _T("")); + ptmp = UniGetContactSettingUtf(new_key_hcnt, szGPGModuleName, "GPGPubKey", _T("")); wstring new_key = ptmp; mir_free(ptmp); f<", s2); s2++; if(output[s] == ')') { - DBWriteContactSettingString(new_key_hcnt, szModuleName, "KeyComment", output.substr(s2,s-s2).c_str()); + DBWriteContactSettingString(new_key_hcnt, szGPGModuleName, "KeyComment", output.substr(s2,s-s2).c_str()); s+=3; s2 = output.find(">", s); - DBWriteContactSettingString(new_key_hcnt, szModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str()); + DBWriteContactSettingString(new_key_hcnt, szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str()); } else - DBWriteContactSettingString(new_key_hcnt, szModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str()); + DBWriteContactSettingString(new_key_hcnt, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str()); } MessageBoxA(0, output.c_str(), "", MB_OK); DeleteFile(tmp2); -- cgit v1.2.3