- CLISTMENUITEM::pszContactOwner removed, because it's supported only by contact's menu;

- Menu_AddContactMenuItem now receives parameter szProto;
- Menu_Add* helpers are converted into real functions;

git-svn-id: http://svn.miranda-ng.org/main/trunk@14409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 11 insertions, 13 deletions

diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index a075dc3cea..6de74333e1 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -117,7 +117,7 @@ void g_MenuInit(void)
 	// "Request authorization"

 	mir_strcpy(pszDest, MS_REQ_AUTH); CreateServiceFunction(str, IcqMenuHandleRequestAuth );

 

-	mi.pszName = LPGEN("Request authorization");

+	mi.name.a = LPGEN("Request authorization");

 	mi.position = 1000030000;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REQUEST);

 	g_hContactMenuItems[ICMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);

@@ -125,7 +125,7 @@ void g_MenuInit(void)
 	// "Grant authorization"

 	mir_strcpy(pszDest, MS_GRANT_AUTH); CreateServiceFunction(str, IcqMenuHandleGrantAuth);

 

-	mi.pszName = LPGEN("Grant authorization");

+	mi.name.a = LPGEN("Grant authorization");

 	mi.position = 1000029999;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_GRANT);

 	g_hContactMenuItems[ICMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);

@@ -133,7 +133,7 @@ void g_MenuInit(void)
 	// "Revoke authorization"

 	mir_strcpy(pszDest, MS_REVOKE_AUTH); CreateServiceFunction(str, IcqMenuHandleRevokeAuth);

 

-	mi.pszName = LPGEN("Revoke authorization");

+	mi.name.a = LPGEN("Revoke authorization");

 	mi.position = 1000029998;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_REVOKE);

 	g_hContactMenuItems[ICMI_AUTH_REVOKE] = Menu_AddContactMenuItem(&mi);

@@ -141,7 +141,7 @@ void g_MenuInit(void)
 	// "Add to server list"

 	mir_strcpy(pszDest, MS_ICQ_ADDSERVCONTACT); CreateServiceFunction(str, IcqMenuHandleAddServContact);

 

-	mi.pszName = LPGEN("Add to server list");

+	mi.name.a = LPGEN("Add to server list");

 	mi.position = -2049999999;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_AUTH_ADD);

 	g_hContactMenuItems[ICMI_ADD_TO_SERVLIST] = Menu_AddContactMenuItem(&mi);

@@ -149,7 +149,7 @@ void g_MenuInit(void)
 	// "Show custom status details"

  	mir_strcpy(pszDest, MS_XSTATUS_SHOWDETAILS); CreateServiceFunction(str, IcqMenuHandleXStatusDetails);

 

-	mi.pszName = LPGEN("Show custom status details");

+	mi.name.a = LPGEN("Show custom status details");

 	mi.position = -2000004999;

 	mi.icolibItem = 0;

 	g_hContactMenuItems[ICMI_XSTATUS_DETAILS] = Menu_AddContactMenuItem(&mi);

@@ -157,7 +157,7 @@ void g_MenuInit(void)
 	// "Open ICQ profile"

 	mir_strcpy(pszDest, MS_OPEN_PROFILE); CreateServiceFunction(str, IcqMenuHandleOpenProfile);

 

-	mi.pszName = LPGEN("Open ICQ profile");

+	mi.name.a = LPGEN("Open ICQ profile");

 	mi.position = 1000029997;

 	g_hContactMenuItems[ICMI_OPEN_PROFILE] = Menu_AddContactMenuItem(&mi);

 }

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 28cd0a0d7d..122d26816a 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -837,7 +837,6 @@ INT_PTR CIcqProto::menuXStatus(WPARAM, LPARAM, LPARAM fParam)
 void CIcqProto::InitXStatusItems(BOOL bAllowStatus)

 {

 	size_t len = mir_strlen(m_szModuleName);

-	char srvFce[MAX_PATH + 64];

 	int bXStatusMenuBuilt = 0;

 

 	BYTE bXStatus = getContactXStatus(NULL);

@@ -861,23 +860,22 @@ void CIcqProto::InitXStatusItems(BOOL bAllowStatus)
 	}

 

 	for (int i = 0; i <= XSTATUS_COUNT; i++) {

-		mir_snprintf(srvFce, _countof(srvFce), "%s/menuXStatus%d", m_szModuleName, i);

-

+		char srvFce[MAX_PATH + 64];

+		mir_snprintf(srvFce, _countof(srvFce), "/menuXStatus%d", i);

 		mi.position++;

 

 		if (!i) 

-			bXStatusMenuBuilt = ServiceExists(srvFce);

+			bXStatusMenuBuilt = ProtoServiceExists(m_szModuleName, srvFce);

 

 		if (!bXStatusMenuBuilt)

 			CreateProtoServiceParam(srvFce+len, &CIcqProto::menuXStatus, i);

 

 		mi.flags = (bXStatus == i ? CMIF_CHECKED : 0);

 		mi.icolibItem = i ? hXStatusIcons[i-1] : NULL;

-		mi.pszName = i ? (char*)nameXStatus[i-1] : (char *)LPGEN("None");

+		mi.name.a = i ? (char*)nameXStatus[i-1] : (char *)LPGEN("None");

 		mi.pszService = srvFce;

-		mi.pszContactOwner = m_szModuleName;

 

-		hXStatusItems[i] = Menu_AddStatusMenuItem(&mi);

+		hXStatusItems[i] = Menu_AddStatusMenuItem(&mi, m_szModuleName);

 		Menu_ShowItem(hXStatusItems[i], !(m_bHideXStatusUI || m_bHideXStatusMenu));

 	}

 }