diff options
-rw-r--r-- | constants.h | 2 | ||||
-rw-r--r-- | gpg_wrapper.cpp | 4 | ||||
-rw-r--r-- | init.cpp | 30 | ||||
-rw-r--r-- | main.cpp | 46 | ||||
-rw-r--r-- | messages.cpp | 28 | ||||
-rw-r--r-- | options.cpp | 90 | ||||
-rw-r--r-- | utilities.cpp | 28 |
7 files changed, 114 insertions, 114 deletions
diff --git a/constants.h b/constants.h index e97a16b..8d853d1 100644 --- a/constants.h +++ b/constants.h @@ -1,4 +1,4 @@ #ifndef CONSTANTS_H #define CONSTANTS_H -#define szModuleName "GPG" +#define szGPGModuleName "GPG" #endif diff --git a/gpg_wrapper.cpp b/gpg_wrapper.cpp index 53f06dc..566031f 100644 --- a/gpg_wrapper.cpp +++ b/gpg_wrapper.cpp @@ -30,7 +30,7 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD unsigned long transfered;
int size;
- TCHAR *bin_path = UniGetContactSettingUtf(NULL, szModuleName, "szGpgBinPath", _T(""));
+ TCHAR *bin_path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T(""));
{
if(_waccess(bin_path, 0) == -1)
if(errno == ENOENT)
@@ -72,7 +72,7 @@ pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD commandline += _T("\"");
commandline += bin_path;
commandline += _T("\" --homedir \"");
- TCHAR *home_dir = UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T(""));
+ TCHAR *home_dir = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
commandline += home_dir;
commandline += _T("\" ");
commandline += *acommandline;
@@ -29,6 +29,7 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam); extern char *date();
MM_INTERFACE mmi = {0};
UTF8_INTERFACE utfi = {0};
+XML_API xi = {0};
#define MIID_GPG { 0x4227c050, 0x8d97, 0x48d2, { 0x91, 0xec, 0x6a, 0x95, 0x2b, 0x3d, 0xab, 0x94 } }
@@ -57,7 +58,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
static char plugname[52];
- strcpy(plugname, szModuleName" [");
+ strcpy(plugname, szGPGModuleName" [");
strcat(plugname, date());
strcat(plugname, " ");
strcat(plugname, __TIME__);
@@ -78,11 +79,11 @@ int SendKey(WPARAM w, LPARAM l); void init_vars()
{
- bAppendTags = DBGetContactSettingByte(NULL, szModuleName, "bAppendTags", 0);
- inopentag = UniGetContactSettingUtf(NULL, szModuleName, "szInOpenTag", _T("<GPGdec>"));
- inclosetag = UniGetContactSettingUtf(NULL, szModuleName, "szInCloseTag", _T("</GnuPGdec>"));
- outopentag = UniGetContactSettingUtf(NULL, szModuleName, "szOutOpenTag", _T("<GPGenc>"));
- outclosetag = UniGetContactSettingUtf(NULL, szModuleName, "szOutCloseTag", _T("</GnuPgenc>"));
+ bAppendTags = DBGetContactSettingByte(NULL, szGPGModuleName, "bAppendTags", 0);
+ inopentag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInOpenTag", _T("<GPGdec>"));
+ inclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInCloseTag", _T("</GnuPGdec>"));
+ outopentag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutOpenTag", _T("<GPGenc>"));
+ outclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutCloseTag", _T("</GnuPgenc>"));
}
extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
@@ -92,6 +93,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
mir_getMMI(&mmi);
mir_getUTFI(&utfi);
+ mir_getXI(&xi); //TODO: check if we have access to api
CreateServiceFunction("/LoadPubKey",LoadKey);
CreateServiceFunction("/ToggleEncryption",ToggleEncryption);
CreateServiceFunction("/SendKey",SendKey);
@@ -124,7 +126,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) int AddContact(WPARAM w, LPARAM l)
{
- CallService(MS_PROTO_ADDTOCONTACT,w,(LPARAM)szModuleName);
+ CallService(MS_PROTO_ADDTOCONTACT,w,(LPARAM)szGPGModuleName);
return 0;
}
@@ -156,18 +158,18 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) PROTOCOLDESCRIPTOR pd = {0};
pd.cbSize=sizeof(PROTOCOLDESCRIPTOR);
- pd.szName=szModuleName;
+ pd.szName=szGPGModuleName;
pd.type=PROTOTYPE_ENCRYPTION;
CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd);
- CreateProtoServiceFunction(szModuleName,PSR_MESSAGE,RecvMsgSvc);
- CreateProtoServiceFunction(szModuleName,PSS_MESSAGE,SendMsgSvc);
- CreateProtoServiceFunction(szModuleName,PSR_MESSAGE"W",RecvMsgSvc);
- CreateProtoServiceFunction(szModuleName,PSS_MESSAGE"W",SendMsgSvc);
+ CreateProtoServiceFunction(szGPGModuleName,PSR_MESSAGE,RecvMsgSvc);
+ CreateProtoServiceFunction(szGPGModuleName,PSS_MESSAGE,SendMsgSvc);
+ CreateProtoServiceFunction(szGPGModuleName,PSR_MESSAGE"W",RecvMsgSvc);
+ CreateProtoServiceFunction(szGPGModuleName,PSS_MESSAGE"W",SendMsgSvc);
for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
- if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)szModuleName))
- CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)szModuleName);
+ if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)szGPGModuleName))
+ CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)szGPGModuleName);
HookEvent(ME_DB_CONTACT_ADDED,AddContact);
@@ -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<<new_key.c_str();
@@ -880,32 +880,32 @@ void ImportKey() MessageBox(0, _T("Set path to gpg.exe first!"), _T("Warning"), MB_OK);
return;
}
- DBDeleteContactSetting(new_key_hcnt, szModuleName, "bAlwatsTrust");
+ DBDeleteContactSetting(new_key_hcnt, szGPGModuleName, "bAlwatsTrust");
cp866_to_cp1251(&output);
{
string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
string::size_type s2 = output.find(":", s);
- DBWriteContactSettingString(new_key_hcnt, szModuleName, "KeyID", output.substr(s,s2-s).c_str());
+ DBWriteContactSettingString(new_key_hcnt, szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str());
s2+=2;
s = output.find("\"", s2)-1;
if(s != s2-1)
- DBWriteContactSettingString(new_key_hcnt, szModuleName, "KeyType", output.substr(s2,s-s2).c_str());
+ DBWriteContactSettingString(new_key_hcnt, szGPGModuleName, "KeyType", output.substr(s2,s-s2).c_str());
s+=2;
if((s2 = output.find("(", s)) == string::npos)
s2 = output.find("<", s);
- DBWriteContactSettingString(new_key_hcnt, szModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str());
+ DBWriteContactSettingString(new_key_hcnt, szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str());
if((s = output.find(")", s2)) == string::npos)
s = output.find(">", 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);
diff --git a/messages.cpp b/messages.cpp index 1fca963..2c095ed 100644 --- a/messages.cpp +++ b/messages.cpp @@ -43,7 +43,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l) s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
if((s2 != wstring::npos) && (s1 != wstring::npos))
{ //this is public key
- if(!DBGetContactSettingByte(ccs->hContact, szModuleName, "GPGEncryption", 0))
+ if(!DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 0))
;//
void ShowNewKeyDialog();
s1 = 0;
@@ -63,10 +63,10 @@ int RecvMsgSvc(WPARAM w, LPARAM l) s2 = str.find(_T("-----END PGP MESSAGE-----"));
if((s2 != wstring::npos) && (s1 != wstring::npos))
{ //this is generic encrypted data block
- if(!DBGetContactSettingByte(ccs->hContact, szModuleName, "GPGEncryption", 0))
+ if(!DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 0))
{
if(MessageBox(0, _T("We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?"), _T("Warning"), MB_YESNO) == IDYES)
- DBWriteContactSettingByte(ccs->hContact, szModuleName, "GPGEncryption", 1);
+ DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 1);
else if(MessageBox(0, _T("Do you want try to decrypt encrypted message ?"), _T("Warning"), MB_YESNO) == IDNO)
return CallService(MS_PROTO_CHAINRECV, w, l);
}
@@ -77,7 +77,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l) }
s2 += _tcslen(_T("-----END PGP MESSAGE-----"));
char *tmp = mir_t2a(str.substr(s1,s2-s1).c_str());
- TCHAR *tmp2 = UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T(""));
+ TCHAR *tmp2 = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
wstring path = tmp2;
path.append(_T("\\encrypted_data.asc"));
wfstream f(path.c_str(), std::ios::out);
@@ -89,7 +89,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l) DWORD code;
wstring cmd;
{
- TCHAR *tmp = UniGetContactSettingUtf(NULL, szModuleName, "szKeyPassword", _T(""));
+ TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));
if(_tcslen(tmp) > 0)
{
cmd += _T("--passphrase \"");
@@ -178,7 +178,7 @@ int SendMsgSvc(WPARAM w, LPARAM l) CCSDATA *ccs = (CCSDATA*)l;
if (!ccs)
return CallService(MS_PROTO_CHAINSEND, w, l);
- if(!DBGetContactSettingByte(ccs->hContact, szModuleName, "GPGEncryption", 0))
+ if(!DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 0))
return CallService(MS_PROTO_CHAINSEND, w, l);
char *msg = (char*)(ccs->lParam);
@@ -196,14 +196,14 @@ int SendMsgSvc(WPARAM w, LPARAM l) DWORD code;
wstring cmd;
wstring path;
- char *tmp = UniGetContactSettingUtf(ccs->hContact, szModuleName, "KeyID", "");
+ char *tmp = UniGetContactSettingUtf(ccs->hContact, szGPGModuleName, "KeyID", "");
if(strlen(tmp) < 2)
{
mir_free(tmp);
return CallService(MS_PROTO_CHAINSEND, w, l);
}
// cmd += _T("--comment \"\" --no-version ");
- if(DBGetContactSettingByte(ccs->hContact, szModuleName, "bAlwaysTrust", 0))
+ if(DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "bAlwaysTrust", 0))
cmd += _T("--trust-model always ");
cmd += _T("--batch --yes -e -a -r ");
TCHAR *tmp2 = mir_a2t(tmp);
@@ -211,7 +211,7 @@ int SendMsgSvc(WPARAM w, LPARAM l) cmd += tmp2;
mir_free(tmp2);
cmd += _T(" \"");
- tmp2 = UniGetContactSettingUtf(NULL, szModuleName, "szHomePath", _T(""));
+ tmp2 = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
path.append(tmp2);
cmd += tmp2;
mir_free(tmp2);
@@ -241,7 +241,7 @@ int SendMsgSvc(WPARAM w, LPARAM l) out.clear();
if(MessageBox(0, _T("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), _T("Warning"), MB_YESNO) == IDYES)
{
- DBWriteContactSettingByte(ccs->hContact, szModuleName, "bAlwaysTrust", 1);
+ DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "bAlwaysTrust", 1);
cmd.insert(0, _T("--trust-model always "));
if(pxExecute(&cmd, "", &out, &code) == pxNotFound)
{
@@ -274,7 +274,7 @@ int SendMsgSvc(WPARAM w, LPARAM l) char *utf = mir_u2a(str.c_str());
ccs->lParam = (LPARAM)utf;
if(bAppendTags)
- DBWriteContactSettingByte(ccs->hContact, szModuleName, "MsgsForTagging", DBGetContactSettingByte(ccs->hContact, szModuleName, "MsgsForTagging", 0) + 1);
+ DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "MsgsForTagging", DBGetContactSettingByte(ccs->hContact, szGPGModuleName, "MsgsForTagging", 0) + 1);
}
}
ccs->wParam&=~PREF_UNICODE;
@@ -284,14 +284,14 @@ int SendMsgSvc(WPARAM w, LPARAM l) int HookSendMsg(WPARAM w, LPARAM l)
{
HANDLE hContact = (HANDLE)w;
- if(!DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0))
+ if(!DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0))
return 0;
if(bAppendTags)
{
if(!l)
return 0;
- BYTE Msgs = DBGetContactSettingByte(hContact, szModuleName, "MsgsForTagging", 0);
+ BYTE Msgs = DBGetContactSettingByte(hContact, szGPGModuleName, "MsgsForTagging", 0);
if(!Msgs)
return 0;
DBEVENTINFO * dbei = (DBEVENTINFO*)l;
@@ -307,7 +307,7 @@ int HookSendMsg(WPARAM w, LPARAM l) mir_free(dbei->pBlob);
dbei->pBlob = (PBYTE)msg2;
dbei->cbBlob = strlen(msg2)+1;
- DBWriteContactSettingByte(hContact, szModuleName, "MsgsForTagging", Msgs - 1);
+ DBWriteContactSettingByte(hContact, szGPGModuleName, "MsgsForTagging", Msgs - 1);
}
}
return 0;
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); diff --git a/utilities.cpp b/utilities.cpp index f909121..9270a21 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -104,7 +104,7 @@ void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szEx pfilter[_tcslen(pfilter)+1] = '\0';
pfilter[_tcslen(pfilter)+2] = '\0';
ofn.lpstrFilter=filter;
- tmp = UniGetContactSettingUtf(0, szModuleName, szSetting, _T(""));
+ tmp = UniGetContactSettingUtf(0, szGPGModuleName, szSetting, _T(""));
_tcscpy(str, tmp);
mir_free(tmp);
if(_tcslen(str)< 2)
@@ -114,7 +114,7 @@ void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szEx ofn.nMaxFileTitle=MAX_PATH;
if(!GetOpenFileName(&ofn))
return;
- DBWriteContactSettingTString(0, szModuleName, szSetting, str);
+ DBWriteContactSettingTString(0, szGPGModuleName, szSetting, str);
}
TCHAR *GetFilePath(TCHAR *WindowTittle, TCHAR *szExt, TCHAR *szExtDesc, bool save_file)
@@ -167,7 +167,7 @@ void GetFolderPath(TCHAR *WindowTittle, char *szSetting) TCHAR path[MAX_PATH];
if (SHGetPathFromIDList(pidl, path))
{
- DBWriteContactSettingTString(NULL, szModuleName, "szHomePath", path);
+ DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", path);
}
IMalloc * imalloc = 0;
if (SUCCEEDED(SHGetMalloc(&imalloc)))
@@ -192,14 +192,14 @@ int LoadKey(WPARAM w, LPARAM l) int SendKey(WPARAM w, LPARAM l)
{
HANDLE hContact = (HANDLE)w;
- char *szMessage = UniGetContactSettingUtf(NULL, szModuleName, "GPGPubKey", "");
+ char *szMessage = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
if(strlen(szMessage) > 1)
{
- BYTE enc = DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0);
- DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", 0);
+ BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
+ DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)szMessage);
HistoryLog(hContact, "Public key sent", EVENTTYPE_MESSAGE, DBEF_SENT);
- DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", enc);
+ DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
}
mir_free(szMessage);
return 0;
@@ -210,8 +210,8 @@ extern HANDLE hLoadPublicKey, hToggleEncryption; int ToggleEncryption(WPARAM w, LPARAM l)
{
HANDLE hContact = (HANDLE)w;
- BYTE enc = DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0);
- DBWriteContactSettingByte(hContact, szModuleName, "GPGEncryption", enc?0:1);
+ BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
+ DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc?0:1);
enc = enc?0:1;
CLISTMENUITEM mi = {0};
mi.cbSize=sizeof(mi);
@@ -227,7 +227,7 @@ int OnPreBuildContactMenu(WPARAM w, LPARAM l) CLISTMENUITEM mi = {0};
mi.cbSize=sizeof(mi);
mi.flags = CMIM_NAME;
- mi.pszName = DBGetContactSettingByte(hContact, szModuleName, "GPGEncryption", 0)?"Turn off GPG encryption":"Turn on GPG encryption";
+ mi.pszName = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0)?"Turn off GPG encryption":"Turn on GPG encryption";
CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);
return 0;
}
@@ -272,7 +272,7 @@ void HistoryLog(HANDLE hContact, char *data, int event_type, int flags) char szText[MAX_PATH]; DBEVENTINFO Event = {0}; Event.cbSize = sizeof(Event); - Event.szModule = szModuleName; + Event.szModule = szGPGModuleName; Event.eventType = event_type; Event.flags = flags, DBEF_UTF; Event.timestamp = (DWORD)time(NULL); @@ -311,8 +311,7 @@ int GetJabberInterface(WPARAM w, LPARAM l) //get interface for all jabber accoun (*p)->setAccountNumber(0); for(int i = 0; i < count; i++) //get only jabber accounts from all accounts { - char *tmp = mir_u2a(accounts[i]->tszAccountName); - IJabberInterface *JIftmp = getJabberApi(tmp); + IJabberInterface *JIftmp = getJabberApi(accounts[i]->szModuleName); int a = 0; if(JIftmp) { @@ -324,8 +323,6 @@ int GetJabberInterface(WPARAM w, LPARAM l) //get interface for all jabber accoun p++; Accounts.push_back(new JabberAccount); } - mir_free(tmp); - //should i free JIftmp ? } Accounts.pop_back(); AddHandlers(); @@ -334,6 +331,7 @@ int GetJabberInterface(WPARAM w, LPARAM l) //get interface for all jabber accoun static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pUserData) { + return FALSE; } |