diff options
Diffstat (limited to 'protocols/IRCG/src')
| -rw-r--r-- | protocols/IRCG/src/ircproto.cpp | 2 | ||||
| -rw-r--r-- | protocols/IRCG/src/services.cpp | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 89cb66953b..4b60263266 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -147,7 +147,7 @@ CIrcProto::~CIrcProto() Netlib_CloseHandle(hNetlibDCC); hNetlibDCC = NULL;
if (hMenuRoot)
- CallService(MO_REMOVEMENUITEM, (WPARAM)hMenuRoot, 0);
+ Menu_RemoveItem(hMenuRoot);
mir_free(m_alias);
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index c8a167d0d6..9f00d7f631 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -40,9 +40,10 @@ void CIrcProto::InitMainMenus(void) hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);
}
else {
- if (hMenuRoot)
- CallService(MO_REMOVEMENUITEM, (WPARAM)hMenuRoot, 0);
- hMenuRoot = NULL;
+ if (hMenuRoot) {
+ Menu_RemoveItem(hMenuRoot);
+ hMenuRoot = NULL;
+ }
}
mi.flags = CMIF_ROOTHANDLE;
@@ -175,10 +176,10 @@ void InitContactMenus(void) void UninitContactMenus(void)
{
- CallService(MO_REMOVEMENUITEM, (WPARAM)hUMenuChanSettings, 0);
- CallService(MO_REMOVEMENUITEM, (WPARAM)hUMenuWhois, 0);
- CallService(MO_REMOVEMENUITEM, (WPARAM)hUMenuDisconnect, 0);
- CallService(MO_REMOVEMENUITEM, (WPARAM)hUMenuIgnore, 0);
+ Menu_RemoveItem(hUMenuChanSettings);
+ Menu_RemoveItem(hUMenuWhois);
+ Menu_RemoveItem(hUMenuDisconnect);
+ Menu_RemoveItem(hUMenuIgnore);
DestroyServiceFunction(hMenuChanSettings);
DestroyServiceFunction(hMenuWhois);
|