From be616d81bdaf8fd4ae61b0a145fb81bbdf467994 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 26 Jun 2015 22:03:02 +0000
Subject: YEEHAW! CLISTMENUITEM::pszPopupName also died

git-svn-id: http://svn.miranda-ng.org/main/trunk@14404 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/FacebookRM/src/theme.cpp | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'protocols/FacebookRM/src')

diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index bb5ab200d6..589d2e125e 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -219,8 +219,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 	if (hRoot == NULL) {
 		CLISTMENUITEM miRoot = { 0 };
 		miRoot.position = 500085000;
-		miRoot.hParentMenu = HGENMENU_ROOT;
-		miRoot.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED);
+		miRoot.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED);
 		miRoot.icolibItem = GetIconHandle("facebook");
 		miRoot.ptszName = m_tszUserName;
 		hRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&miRoot);
@@ -232,7 +231,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 		}
 	}
 
-	mi.flags = CMIF_ROOTHANDLE | (this->isOnline() ? 0 : CMIF_GRAYED);
+	mi.flags = (this->isOnline() ? 0 : CMIF_GRAYED);
 	mi.position = 201001;
 	mi.hParentMenu = hRoot;
 
@@ -244,7 +243,6 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 
 	//CreateProtoService("/VisitProfile",&FacebookProto::VisitProfile);
 	mir_strcpy(tDest, "/VisitProfile");
-	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszName = LPGEN("Visit profile");
 	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);
 	// TODO RM: remember and properly free in destructor?
@@ -257,38 +255,25 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 	Menu_AddProtoMenuItem(&mi);
 
 	// Services...
-	mi.pszName = LPGEN("Services...");
-	mir_strcpy(tDest, "/Services");
-	mi.flags = CMIF_ROOTHANDLE | (this->isOnline() ? 0 : CMIF_GRAYED);
-	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP);
-	m_hMenuServicesRoot = Menu_AddProtoMenuItem(&mi);
+	mi.hParentMenu = m_hMenuServicesRoot = Menu_CreateRoot(MO_PROTO, LPGENT("Services..."), mi.position, Skin_GetIconHandle(SKINICON_OTHER_HELP));
 
 	CreateProtoService("/RefreshBuddyList", &FacebookProto::RefreshBuddyList);
 	mir_strcpy(tDest, "/RefreshBuddyList");
-	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszName = LPGEN("Refresh Buddy List");
-	mi.pszPopupName = LPGEN("Services");
 	mi.icolibItem = GetIconHandle("friendship");
-	mi.hParentMenu = m_hMenuServicesRoot;
 	Menu_AddProtoMenuItem(&mi);
 
 	CreateProtoService("/CheckFriendRequests", &FacebookProto::CheckFriendRequests);
 	mir_strcpy(tDest, "/CheckFriendRequests");
-	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszName = LPGEN("Check Friends Requests");
 	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
-	mi.hParentMenu = m_hMenuServicesRoot;
 	Menu_AddProtoMenuItem(&mi);
 
 	CreateProtoService("/CheckNewsfeeds", &FacebookProto::CheckNewsfeeds);
 	mir_strcpy(tDest, "/CheckNewsfeeds");
-	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszName = LPGEN("Check Newsfeeds");
-	mi.pszPopupName = LPGEN("Services");
 	mi.icolibItem = GetIconHandle("newsfeed");
-	mi.hParentMenu = m_hMenuServicesRoot;
 	Menu_AddProtoMenuItem(&mi);
-
 	return 0;
 }
 
-- 
cgit v1.2.3