summaryrefslogtreecommitdiff
path: root/protocols/Tlen/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-04-05 23:13:56 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-04-05 23:13:56 +0000
commit4810d4b1b7a47701b8e6c45490fb2643ea425123 (patch)
treefb94dd5889fdd0558605ffe738f0b2d6d2f08ca2 /protocols/Tlen/src
parent007b4c7301f0d26a72f89f74e9929f42e24eb3e6 (diff)
rest of menu cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@4325 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tlen/src')
-rw-r--r--protocols/Tlen/src/jabber.h2
-rw-r--r--protocols/Tlen/src/jabber_iqid.cpp4
-rw-r--r--protocols/Tlen/src/jabber_svc.cpp2
-rw-r--r--protocols/Tlen/src/jabber_thread.cpp4
-rw-r--r--protocols/Tlen/src/tlen.cpp4
5 files changed, 8 insertions, 8 deletions
diff --git a/protocols/Tlen/src/jabber.h b/protocols/Tlen/src/jabber.h
index 2b3899cc3a..28459d781a 100644
--- a/protocols/Tlen/src/jabber.h
+++ b/protocols/Tlen/src/jabber.h
@@ -314,7 +314,7 @@ struct TlenProtocol : public PROTO_INTERFACE
CRITICAL_SECTION modeMsgMutex;
- HANDLE hMenuRoot;
+ HGENMENU hMenuRoot;
char *searchJID;
int searchID;
diff --git a/protocols/Tlen/src/jabber_iqid.cpp b/protocols/Tlen/src/jabber_iqid.cpp
index ef5a6844dc..a94630b628 100644
--- a/protocols/Tlen/src/jabber_iqid.cpp
+++ b/protocols/Tlen/src/jabber_iqid.cpp
@@ -243,9 +243,9 @@ void JabberIqResultRoster(TlenProtocol *proto, XmlNode *iqNode)
{
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS;
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) proto->hMenuMUC, (LPARAM) &mi);
+ Menu_ModifyItem(proto->hMenuMUC, &mi);
if (proto->hMenuChats != NULL)
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) proto->hMenuChats, (LPARAM)&mi);
+ Menu_ModifyItem(proto->hMenuChats, &mi);
}
proto->isOnline = TRUE;
diff --git a/protocols/Tlen/src/jabber_svc.cpp b/protocols/Tlen/src/jabber_svc.cpp
index db39892f83..8a505ac471 100644
--- a/protocols/Tlen/src/jabber_svc.cpp
+++ b/protocols/Tlen/src/jabber_svc.cpp
@@ -1191,7 +1191,7 @@ int __cdecl TlenProtocol::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPAR
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_NAME | CMIF_TCHAR;
mi.ptszName = m_tszUserName;
- CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )hMenuRoot, ( LPARAM )&mi );
+ Menu_ModifyItem(hMenuRoot, &mi);
/* FIXME: Rename network user as well */
}
}
diff --git a/protocols/Tlen/src/jabber_thread.cpp b/protocols/Tlen/src/jabber_thread.cpp
index 31fb47a10f..ce4a95f539 100644
--- a/protocols/Tlen/src/jabber_thread.cpp
+++ b/protocols/Tlen/src/jabber_thread.cpp
@@ -353,9 +353,9 @@ void __cdecl JabberServerThread(ThreadData *info)
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS | CMIF_GRAYED;
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) info->proto->hMenuMUC, (LPARAM) &mi);
+ Menu_ModifyItem(info->proto->hMenuMUC, &mi);
if (info->proto->hMenuChats != NULL)
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) info->proto->hMenuChats, (LPARAM) &mi);
+ Menu_ModifyItem(info->proto->hMenuChats, &mi);
// Set status to offline
oldStatus = info->proto->m_iStatus;
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 495a89a0ee..de5c844120 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -321,7 +321,7 @@ static void initMenuItems(TlenProtocol *proto)
mi.icolibItem = GetIconHandle(IDI_CHATS);
mi.pszService = text;
proto->hMenuChats = Menu_AddMainMenuItem(&mi);
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) proto->hMenuChats, (LPARAM) &clmi);
+ Menu_ModifyItem(proto->hMenuChats, &clmi);
}
// "Multi-User Conference"
@@ -332,7 +332,7 @@ static void initMenuItems(TlenProtocol *proto)
mi.icolibItem = GetIconHandle(IDI_MUC);
mi.pszService = text;
proto->hMenuMUC = Menu_AddMainMenuItem(&mi);
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) proto->hMenuMUC, (LPARAM) &clmi);
+ Menu_ModifyItem(proto->hMenuMUC, &clmi);
sprintf(text, "%s/MainMenuInbox", proto->m_szModuleName);
CreateServiceFunction_Ex(text, proto, TlenMenuHandleInbox);