From 35daa0c0ba771eb0bab7f870f12eaf265ec58a2d Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 23 Aug 2010 18:36:26 +0300 Subject: secureim code parts new file: clist.cpp modified: commonheaders.h new file: icons.cpp new file: icons/secured.ico new file: icons/unsecured.ico modified: init.cpp new file: m_extraicons.h new file: m_metacontacts.h new file: metacontacts.cpp modified: new_gpg.vcproj new file: srmm.cpp modified: utilities.cpp modified: utilities.h --- init.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'init.cpp') diff --git a/init.cpp b/init.cpp index 7523ef4..3fcd33c 100644 --- a/init.cpp +++ b/init.cpp @@ -17,15 +17,15 @@ #include "commonheaders.h" //global variables -bool bAppendTags = false, bDebugLog = false, bJabberAPI = false; +bool bAppendTags = false, bDebugLog = false, bJabberAPI = false, bIsMiranda09 = false, bMetaContacts = false; TCHAR *inopentag = NULL, *inclosetag = NULL, *outopentag = NULL, *outclosetag = NULL, *password = NULL; -bool bIsMiranda09 = false; list Accounts; HINSTANCE hInst; -HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL, hSendKey = NULL; +HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL, hSendKey = NULL, g_hCLIcon = NULL; PLUGINLINK *pluginLink; +IconExtraColumn g_IEC = {0}; static int OnModulesLoaded(WPARAM wParam,LPARAM lParam); extern char *date(); MM_INTERFACE mmi = {0}; @@ -149,8 +149,12 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) int RecvMsgSvc(WPARAM w, LPARAM l); int SendMsgSvc(WPARAM w, LPARAM l); int HookSendMsg(WPARAM w, LPARAM l); - int TestHook(WPARAM w, LPARAM l); +// int TestHook(WPARAM w, LPARAM l); int GetJabberInterface(WPARAM w, LPARAM l); + int onWindowEvent(WPARAM wParam, LPARAM lParam); + int onIconPressed(WPARAM wParam, LPARAM lParam); + int onExtraImageListRebuilding(WPARAM, LPARAM); + int onExtraImageApplying(WPARAM wParam, LPARAM); void InitCheck(); @@ -159,6 +163,7 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) InitCheck(); bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090100?true:false; + bMetaContacts = ServiceExists(MS_MC_GETMETACONTACT); if(bJabberAPI && bIsMiranda09) GetJabberInterface(0,0); @@ -167,8 +172,16 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) HookEvent(ME_DB_EVENT_FILTER_ADD, HookSendMsg); if(bJabberAPI && bIsMiranda09) HookEvent(ME_PROTO_ACCLISTCHANGED, GetJabberInterface); -// HookEvent(ME_NETLIB_FASTSEND, TestHook); - hOnPreBuildContactMenu = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPreBuildContactMenu); + + HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPreBuildContactMenu); + + HookEvent(ME_MSG_WINDOWEVENT, onWindowEvent); + HookEvent(ME_MSG_ICONPRESSED, onIconPressed); + + if(ServiceExists(MS_EXTRAICON_REGISTER)) + g_hCLIcon = ExtraIcon_Register(szGPGModuleName, Translate("SecureIM status"), "sim_cm_est", (MIRANDAHOOK)onExtraImageListRebuilding, (MIRANDAHOOK)onExtraImageApplying); + + PROTOCOLDESCRIPTOR pd = {0}; pd.cbSize=sizeof(PROTOCOLDESCRIPTOR); -- cgit v1.2.3