From 3234474db8b36b1a644d8686c5a54d261748769f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 27 Jun 2015 12:54:43 +0000
Subject: fix for the protocols' menus

git-svn-id: http://svn.miranda-ng.org/main/trunk@14411 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Tox/src/tox_menus.cpp | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

(limited to 'protocols/Tox')

diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp
index b023a668ba..fd99f26022 100644
--- a/protocols/Tox/src/tox_menus.cpp
+++ b/protocols/Tox/src/tox_menus.cpp
@@ -76,41 +76,35 @@ void CToxProto::UninitMenus()
 
 int CToxProto::OnInitStatusMenu()
 {
-	char text[MAX_PATH];
-	mir_strcpy(text, m_szModuleName);
-	char *tDest = text + mir_strlen(text);
-
-	CLISTMENUITEM mi = { 0 };
-	mi.pszService = text;
-
-	HGENMENU hStatusMunuRoot = Menu_GetProtocolRoot(m_szModuleName);
-	if (!hStatusMunuRoot)
+	HGENMENU hStatusMenuRoot = Menu_GetProtocolRoot(m_szModuleName);
+	if (!hStatusMenuRoot)
 	{
+		CLISTMENUITEM mi = { 0 };
 		mi.name.t = m_tszUserName;
 		mi.position = -1999901006;
 		mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
 		mi.icolibItem = Skin_GetIconHandle("main");
-		hStatusMunuRoot = Menu_AddProtoMenuItem(&mi);
+		hStatusMenuRoot = Menu_AddProtoMenuItem(&mi);
 	}
 
-	mi.hParentMenu = hStatusMunuRoot;
-	mi.flags = CMIF_TCHAR;
+	CLISTMENUITEM mi = { 0 };
+	mi.hParentMenu = hStatusMenuRoot;
 
 	// Create copy tox id command
-	mir_strcpy(tDest, "/CopyToxID");
-	CreateProtoService(tDest, &CToxProto::OnCopyToxID);
+	mi.pszService = "/CopyToxID";
+	CreateProtoService(mi.pszService, &CToxProto::OnCopyToxID);
 	mi.name.t = LPGENT("Copy Tox ID");
 	mi.position = SMI_POSITION + SMI_TOXID_COPY;
-	Menu_AddProtoMenuItem(&mi);
-
+	Menu_AddProtoMenuItem(&mi, m_szModuleName);
 	
 	// Create group chat command
-	/*mir_strcpy(tDest, "/CreateChatRoom");
-	CreateProtoService(tDest, &CToxProto::OnCreateChatRoom);
+	/*
+	mi.pszService = "/CreateChatRoom";
+	CreateProtoService(mi.pszService, &CToxProto::OnCreateChatRoom);
 	mi.name.t = LPGENT("Create group chat");
 	mi.position = SMI_POSITION + SMI_GROUPCHAT_CREATE;
 	mi.icolibItem = Skin_GetIconHandle("conference");
-	HGENMENU hCreateChatRoom = Menu_AddProtoMenuItem(&mi);*/
+	HGENMENU hCreateChatRoom = Menu_AddProtoMenuItem(&mi, m_szModuleName);*/
 
 	return 0;
 }
\ No newline at end of file
-- 
cgit v1.2.3