From 03df9032e2b6248fed2bcf1e6d40fbfba4581779 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 27 Jun 2015 19:28:09 +0000
Subject: minor menu related fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@14420 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/FacebookRM/src/proto.cpp    |  6 ------
 protocols/JabberG/src/jabber_menu.cpp |  3 ++-
 protocols/Tlen/src/tlen.cpp           | 11 ++++++-----
 3 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'protocols')

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index df22c38441..38a70354a5 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -41,13 +41,7 @@ FacebookProto::FacebookProto(const char* proto_name, const TCHAR* username) :
 	// Initialize random seed for this client
 	facy.random_ = ::time(NULL) + PtrToUint(&facy);
 
-	m_hMenuRoot = m_hMenuServicesRoot = m_hStatusMind = NULL;
-
-	m_invisible = false;
-	m_signingOut = false;
 	m_enableChat = DEFAULT_ENABLE_CHATS;
-	m_idleTS = 0;
-	m_pingTS = 0;
 
 	// Load custom locale, if set
 	ptrA locale(getStringA(FACEBOOK_KEY_LOCALE));
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 4c2091eb02..027890622f 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -288,19 +288,20 @@ void g_MenuInit(void)
 	g_hMenuDirectPresence[0] = Menu_AddContactMenuItem(&mi);
 
 	mi.flags |= CMIF_TCHAR;
+	mi.hParentMenu = g_hMenuDirectPresence[0];
 	for (int i = 0; i < _countof(PresenceModeArray); i++) {
 		char buf[] = "Jabber/DirectPresenceX";
 		buf[_countof(buf) - 2] = '0' + i;
 		mi.pszService = buf;
 		mi.name.t = pcli->pfnGetStatusModeDescription(PresenceModeArray[i].mode, 0);
 		mi.position = -1999901000;
-		mi.hParentMenu = g_hMenuDirectPresence[0];
 		mi.icolibItem = Skin_LoadIcon(PresenceModeArray[i].icon);
 		g_hMenuDirectPresence[i + 1] = Menu_AddContactMenuItem(&mi);
 		CreateServiceFunctionParam(mi.pszService, JabberMenuHandleDirectPresence, PresenceModeArray[i].mode);
 	}
 
 	mi.flags &= ~(CMIF_TCHAR);
+	mi.hParentMenu = NULL;
 
 	// Resource selector
 	mi.pszService = "Jabber/ResourceSelectorDummySvc";
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 660967c6c3..9476cb3f37 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -287,11 +287,12 @@ void TlenProtocol::initMenuItems()
 	mi.pszService = text;
 	hMenuInbox = Menu_AddMainMenuItem(&mi);
 
+	// contact menu items
 	mi.hParentMenu = NULL;
 
 	// "Send picture"
 	mi.pszService = "/SendPicture";
-	CreateProtoService(pSvcName, &TlenProtocol::ContactMenuHandleSendPicture);
+	CreateProtoService(mi.pszService, &TlenProtocol::ContactMenuHandleSendPicture);
 	mi.name.a = LPGEN("Send picture");
 	mi.position = -2000019030;
 	mi.icolibItem = GetIconHandle(IDI_IMAGE);
@@ -299,7 +300,7 @@ void TlenProtocol::initMenuItems()
 
 	// "Invite to MUC"
 	mi.pszService = "/ContactMenuMUC";
-	CreateProtoService(pSvcName, &TlenProtocol::MUCContactMenuHandleMUC);
+	CreateProtoService(mi.pszService, &TlenProtocol::MUCContactMenuHandleMUC);
 	mi.name.a = LPGEN("Multi-User Conference");
 	mi.position = -2000019020;
 	mi.icolibItem = GetIconHandle(IDI_MUC);
@@ -307,7 +308,7 @@ void TlenProtocol::initMenuItems()
 
 	// "Invite to voice chat"
 	mi.pszService = "/ContactMenuVoice";
-	CreateProtoService(pSvcName, &TlenProtocol::VoiceContactMenuHandleVoice);
+	CreateProtoService(mi.pszService, &TlenProtocol::VoiceContactMenuHandleVoice);
 	mi.name.a = LPGEN("Voice Chat");
 	mi.position = -2000019010;
 	mi.icolibItem = GetIconHandle(IDI_VOICE);
@@ -315,7 +316,7 @@ void TlenProtocol::initMenuItems()
 
 	// "Request authorization"
 	mi.pszService = "/RequestAuth";
-	CreateProtoService(pSvcName, &TlenProtocol::ContactMenuHandleRequestAuth);
+	CreateProtoService(mi.pszService, &TlenProtocol::ContactMenuHandleRequestAuth);
 	mi.name.a = LPGEN("Request authorization");
 	mi.position = -2000001001;
 	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
@@ -323,7 +324,7 @@ void TlenProtocol::initMenuItems()
 
 	// "Grant authorization"
 	mi.pszService = "/GrantAuth";
-	CreateProtoService(pSvcName, &TlenProtocol::ContactMenuHandleGrantAuth);
+	CreateProtoService(mi.pszService, &TlenProtocol::ContactMenuHandleGrantAuth);
 	mi.name.a = LPGEN("Grant authorization");
 	mi.position = -2000001000;
 	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);
-- 
cgit v1.2.3