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 --- init.cpp | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'init.cpp') diff --git a/init.cpp b/init.cpp index 65d49b7..b5471d8 100644 --- a/init.cpp +++ b/init.cpp @@ -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("")); - inclosetag = UniGetContactSettingUtf(NULL, szModuleName, "szInCloseTag", _T("")); - outopentag = UniGetContactSettingUtf(NULL, szModuleName, "szOutOpenTag", _T("")); - outclosetag = UniGetContactSettingUtf(NULL, szModuleName, "szOutCloseTag", _T("")); + bAppendTags = DBGetContactSettingByte(NULL, szGPGModuleName, "bAppendTags", 0); + inopentag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInOpenTag", _T("")); + inclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInCloseTag", _T("")); + outopentag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutOpenTag", _T("")); + outclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutCloseTag", _T("")); } 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); -- cgit v1.2.3