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/Gadu-Gadu/src/gg.cpp        | 5 ++---
 protocols/Gadu-Gadu/src/groupchat.cpp | 2 +-
 protocols/Gadu-Gadu/src/import.cpp    | 2 +-
 protocols/Gadu-Gadu/src/links.cpp     | 2 +-
 protocols/Gadu-Gadu/src/sessions.cpp  | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'protocols/Gadu-Gadu')

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index b6b75db861..7a7a6dd8d6 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -269,14 +269,13 @@ void GGPROTO::menus_init()
    if (hRoot == NULL) {
       mi.ptszName = m_tszUserName;
       mi.position = 500090000;
-      mi.hParentMenu = HGENMENU_ROOT;
-      mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+      mi.flags = CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
       mi.icolibItem = iconList[0].hIcolib;
       hGCRoot = hCLRoot = hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);
    }
    else {
       mi.hParentMenu = hRoot;
-      mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
+      mi.flags = CMIF_TCHAR;
 
       mi.ptszName = LPGENT("Conference");
       mi.position = 200001;
diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index 9019e9278b..76f99f114f 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -60,7 +60,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot)
 		char service[64];
 
 		CLISTMENUITEM mi = { 0 };
-		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
+		mi.flags = CMIF_TCHAR;
 		mi.hParentMenu = hRoot;
 
 		// Conferencing
diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp
index b82554d567..b9c925d1d4 100644
--- a/protocols/Gadu-Gadu/src/import.cpp
+++ b/protocols/Gadu-Gadu/src/import.cpp
@@ -520,7 +520,7 @@ void GGPROTO::import_init(HGENMENU hRoot)
 	CreateProtoService(GGS_IMPORT_SERVER, &GGPROTO::import_server);
 
 	CLISTMENUITEM mi = { 0 };
-	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
+	mi.flags = CMIF_TCHAR;
 	mi.hParentMenu = hRoot;
 	mi.position = 2000500001;
 	mi.icolibItem = iconList[1].hIcolib;
diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp
index 15a1da12a8..f8f04874d1 100644
--- a/protocols/Gadu-Gadu/src/links.cpp
+++ b/protocols/Gadu-Gadu/src/links.cpp
@@ -27,7 +27,7 @@
 #define GGS_PARSELINK "GG/ParseLink"
 #define GGS_MENUCHOOSE "GG/MenuChoose"
 
-static HANDLE hInstanceMenu;
+static int hInstanceMenu;
 
 static INT_PTR gg_menuchoose(WPARAM wParam, LPARAM lParam)
 {
diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp
index 2e7339e74d..1b19989681 100644
--- a/protocols/Gadu-Gadu/src/sessions.cpp
+++ b/protocols/Gadu-Gadu/src/sessions.cpp
@@ -421,7 +421,7 @@ void GGPROTO::sessions_menus_init(HGENMENU hRoot)
 	CreateProtoService(GGS_CONCUR_SESS, &GGPROTO::sessions_view);
 
 	CLISTMENUITEM mi = { 0 };
-	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
+	mi.flags = CMIF_TCHAR;
 	mi.hParentMenu = hRoot;
 	mi.position = (hMenuRoot) ? 2050000001 : 200003;
 	mi.icolibItem = iconList[16].hIcolib;
-- 
cgit v1.2.3