summaryrefslogtreecommitdiff
path: root/protocols/MSN
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/MSN')
-rw-r--r--protocols/MSN/src/msn.cpp5
-rw-r--r--protocols/MSN/src/msn_menu.cpp5
2 files changed, 2 insertions, 8 deletions
diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp
index 2dee47d58e..0f4079639b 100644
--- a/protocols/MSN/src/msn.cpp
+++ b/protocols/MSN/src/msn.cpp
@@ -29,8 +29,6 @@ HINSTANCE hInst;
int hLangpack;
TIME_API tmi;
-HANDLE hMooduleLoaded;
-
/////////////////////////////////////////////////////////////////////////////////////////
// Initialization routines
@@ -117,7 +115,7 @@ extern "C" int __declspec(dllexport) Load(void)
mir_getTMI(&tmi);
mir_getLP(&pluginInfo);
- hMooduleLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
+ HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
PROTOCOLDESCRIPTOR pd = { sizeof(pd) };
pd.szName = "MSN";
@@ -138,7 +136,6 @@ extern "C" int __declspec(dllexport) Unload(void)
{
MSN_RemoveContactMenus();
MsnLinks_Destroy();
- UnhookEvent(hMooduleLoaded);
return 0;
}
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index ddc2e1c4cc..aa8c3cb5ab 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "msn_global.h"
#include "msn_proto.h"
-static HANDLE hPrebuildMenuHook;
static HGENMENU
hBlockMenuItem,
hLiveSpaceMenuItem,
@@ -483,13 +482,11 @@ void MSN_InitContactMenu(void)
mi.pszName = LPGEN("Open &Hotmail Inbox");
hOpenInboxMenuItem = Menu_AddContactMenuItem(&mi);
- hPrebuildMenuHook = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, MSN_OnPrebuildContactMenu);
+ HookEvent(ME_CLIST_PREBUILDCONTACTMENU, MSN_OnPrebuildContactMenu);
}
void MSN_RemoveContactMenus(void)
{
- UnhookEvent(hPrebuildMenuHook);
-
CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hBlockMenuItem, 0);
CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hLiveSpaceMenuItem, 0);
CallService(MS_CLIST_REMOVECONTACTMENUITEM, (WPARAM)hNetmeetingMenuItem, 0);