Menu_ModifyItem unbound from CLISTMENUITEM structure

git-svn-id: http://svn.miranda-ng.org/main/trunk@14334 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 6 insertions, 17 deletions

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index c0acd7d49d..fbf6d2a30a 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -264,9 +264,7 @@ void TlenProtocol::initMenuItems()
 	strncpy_s(text, sizeof(text), m_szModuleName, _TRUNCATE);

 	char *pSvcName = text + mir_strlen(text);

 

-	CLISTMENUITEM mi = { 0 }, clmi = { 0 };

-	clmi.flags = CMIM_FLAGS | CMIF_GRAYED;

-

+	CLISTMENUITEM mi = { 0 };

 	mi.pszContactOwner = m_szModuleName;

 	mi.popupPosition = 500090000;

 

@@ -292,7 +290,6 @@ void TlenProtocol::initMenuItems()
 	mi.icolibItem = GetIconHandle(IDI_MUC);

 	mi.pszService = text;

 	hMenuMUC = Menu_AddMainMenuItem(&mi);

-	Menu_ModifyItem(hMenuMUC, &clmi);

 

 	mir_strcpy(pSvcName, "/MainMenuInbox");

 	CreateProtoService(pSvcName, &TlenProtocol::MenuHandleInbox);

diff --git a/protocols/Tlen/src/tlen_iqid.cpp b/protocols/Tlen/src/tlen_iqid.cpp
index 71233ee979..70876b4a00 100644
--- a/protocols/Tlen/src/tlen_iqid.cpp
+++ b/protocols/Tlen/src/tlen_iqid.cpp
@@ -220,11 +220,9 @@ void TlenIqResultRoster(TlenProtocol *proto, XmlNode *iqNode)
 				}

 			}

 

-			CLISTMENUITEM mi = { 0 };

-			mi.flags = CMIM_FLAGS;

-			Menu_ModifyItem(proto->hMenuMUC, &mi);

+			Menu_ModifyItem(proto->hMenuMUC, NULL, INVALID_HANDLE_VALUE, 0);

 			if (proto->hMenuChats != NULL)

-				Menu_ModifyItem(proto->hMenuChats, &mi);

+				Menu_ModifyItem(proto->hMenuChats, NULL, INVALID_HANDLE_VALUE, 0);

 

 			proto->isOnline = TRUE;

 			proto->debugLogA("Status changed via THREADSTART");

diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 8445565213..6406889bb9 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -1160,11 +1160,7 @@ int TlenProtocol::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lPara
 	case EV_PROTO_ONEXIT:    return PreShutdown(0, 0);

 

 	case EV_PROTO_ONRENAME:

-		CLISTMENUITEM mi = { 0 };

-		mi.flags = CMIM_NAME | CMIF_TCHAR;

-		mi.ptszName = m_tszUserName;

-		Menu_ModifyItem(hMenuRoot, &mi);

-		/* FIXME: Rename network user as well */

+		Menu_ModifyItem(hMenuRoot, m_tszUserName);

 	}

 	return 1;

 }

diff --git a/protocols/Tlen/src/tlen_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp
index 6cc8af6278..0e87420ca3 100644
--- a/protocols/Tlen/src/tlen_thread.cpp
+++ b/protocols/Tlen/src/tlen_thread.cpp
@@ -340,11 +340,9 @@ void __cdecl TlenServerThread(ThreadData *info)
 			info->proto->isOnline = FALSE;

 			info->proto->isConnected = FALSE;

 

-			CLISTMENUITEM mi = { 0 };

-			mi.flags = CMIM_FLAGS | CMIF_GRAYED;

-			Menu_ModifyItem(info->proto->hMenuMUC, &mi);

+			Menu_ModifyItem(info->proto->hMenuMUC, NULL, INVALID_HANDLE_VALUE, CMIF_GRAYED);

 			if (info->proto->hMenuChats != NULL)

-				Menu_ModifyItem(info->proto->hMenuChats, &mi);

+				Menu_ModifyItem(info->proto->hMenuChats, NULL, INVALID_HANDLE_VALUE, CMIF_GRAYED);

 

 			// Set status to offline

 			char *szProto = info->proto->m_szModuleName;