From 302abe573a8256d8c813af8f55d436e7b1c1dfb6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 10 Oct 2013 19:11:06 +0000
Subject: GTalk: old menu restored (in protocol menu)

git-svn-id: http://svn.miranda-ng.org/main/trunk@6431 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/GTalkExt/src/menu.cpp | 72 +++++++++--------------------------------
 1 file changed, 16 insertions(+), 56 deletions(-)

(limited to 'protocols/GTalkExt/src/menu.cpp')

diff --git a/protocols/GTalkExt/src/menu.cpp b/protocols/GTalkExt/src/menu.cpp
index 28f84ddb8b..7d09ec15fa 100644
--- a/protocols/GTalkExt/src/menu.cpp
+++ b/protocols/GTalkExt/src/menu.cpp
@@ -26,72 +26,32 @@
 #include "inbox.h"
 
 #define MS_GTALKEXT_OPENMAILBOX SHORT_PLUGIN_NAME "/OpenMailbox"
-#define OPEN_MAILBOX_ITEM_CAPTION LPGENT("Open mailbox")
 
 extern HICON g_hPopupIcon;
 
-HANDLE hOpenMailboxService = 0;
-HANDLE hOnPrebuildMenu = 0;
-
-HGENMENU hOpenMailboxMenuItem = 0;
-
-INT_PTR OpenMailboxMenuHandler(WPARAM wParam, LPARAM lParam)
-{
-	HANDLE hContact = (HANDLE)wParam;
-	if (db_get_b(hContact, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 0))
-		OpenContactInbox(hContact);
-	return 0;
-}
-
-int OnPrebuildMenu(WPARAM wParam, LPARAM lParam)
+INT_PTR OpenMailboxMenuHandler(WPARAM wParam, LPARAM lParam, LPARAM param)
 {
-	CLISTMENUITEM cmi = { sizeof(cmi) };
-	cmi.flags = CMIM_FLAGS;
-	if (!db_get_b((HANDLE)wParam, SHORT_PLUGIN_NAME, PSEUDOCONTACT_FLAG, 0))
-		cmi.flags |= CMIF_HIDDEN;
-	Menu_ModifyItem(hOpenMailboxMenuItem, &cmi);
+	OpenContactInbox((LPCSTR)param);
 	return 0;
 }
 
-BOOL InitMenus(BOOL init)
+int InitMenus(WPARAM wParam, LPARAM lParam)
 {
-	if (init) {
-		hOpenMailboxService = (HANDLE)CreateServiceFunction(MS_GTALKEXT_OPENMAILBOX, OpenMailboxMenuHandler);
-		if (!hOpenMailboxService) {
-			InitMenus(FALSE);
-			return FALSE;
-		}
-
-		extern HICON g_hPopupIcon;
+	GoogleTalkAcc* pga = isGoogle(lParam);
+	if (pga != NULL) {
+		LPCSTR szModuleName = pga->m_japi->GetModuleName();
+		char szServiceName[100];
+		mir_snprintf(szServiceName, SIZEOF(szServiceName), "%s/%s", szModuleName, MS_GTALKEXT_OPENMAILBOX);
+		CreateServiceFunctionParam(szServiceName, OpenMailboxMenuHandler, (LPARAM)szModuleName);
 
 		CLISTMENUITEM cmi = { sizeof(cmi) };
-		cmi.flags = CMIF_TCHAR;
+		cmi.flags = CMIF_CHILDPOPUP;
+		cmi.hParentMenu = HGENMENU(wParam);
 		cmi.hIcon = g_hPopupIcon;
-		cmi.ptszName = OPEN_MAILBOX_ITEM_CAPTION;
-		cmi.pszService = MS_GTALKEXT_OPENMAILBOX;
-		hOpenMailboxMenuItem = Menu_AddContactMenuItem(&cmi);
-
-		if (!hOpenMailboxMenuItem) {
-			InitMenus(FALSE);
-			return FALSE;
-		}
-
-		hOnPrebuildMenu = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPrebuildMenu);
-		if (!hOnPrebuildMenu) {
-			InitMenus(FALSE);
-			return FALSE;
-		}
+		cmi.position = 200101;
+		cmi.pszName = LPGEN("Open mailbox");
+		cmi.pszService = szServiceName;
+		Menu_AddProtoMenuItem(&cmi);
 	}
-	else {
-		if (hOnPrebuildMenu) {
-			UnhookEvent(hOnPrebuildMenu);
-			hOnPrebuildMenu = 0;
-		}
-		if (hOpenMailboxService) {
-			DestroyServiceFunction(hOpenMailboxService);
-			hOpenMailboxService = 0;
-		}
-	}
-
-	return TRUE;
+	return 0;
 }
-- 
cgit v1.2.3