From 4036e52a03cba9c3bd345796407a851153377279 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Fri, 7 Mar 2014 13:43:51 +0000 Subject: MRA + Add: hidden option "xStatusShowAll" to allow select x-status Dating * Fix: Blog status icon does not display * Fix: SetContactStatus for contacts without authorization on user info update* code cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@8445 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/Mra_menus.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'protocols/MRA/src/Mra_menus.cpp') diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index 1171f147bd..d4fa5a7c16 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -290,9 +290,13 @@ int CMraProto::MraRebuildStatusMenu(WPARAM wParam, LPARAM lParam) mi.pszContactOwner = m_szModuleName; CMStringW szStatusTitle; - for (size_t i = 0; i < MRA_XSTATUS_COUNT; i++) { + + DWORD dwCount = MRA_XSTATUS_OFF_CLI_COUNT; + if (getByte(NULL, "xStatusShowAll", MRA_DEFAULT_SHOW_ALL_XSTATUSES)) + dwCount = MRA_XSTATUS_COUNT; + for (DWORD i = 0; i < dwCount; i ++) { mir_snprintf(pszServiceFunctionName, 100, "/menuXStatus%ld", i); - mi.position++; + mi.position ++; if (i) { mir_snprintf(szValueName, SIZEOF(szValueName), "XStatus%ldName", i); if (mraGetStringW(NULL, szValueName, szStatusTitle)) @@ -386,7 +390,7 @@ void CMraProto::InitMenus() hContactMenuRoot = CListCreateMenu(-2000001001, -500050000, FALSE, gdiContactMenuItems, CONTACT_MENU_ITEMS_COUNT, hContactMenuItems); // xstatus menu - for (int i = 0; i < MRA_XSTATUS_COUNT; i++) { + for (DWORD i = 0; i < MRA_XSTATUS_COUNT; i++) { char szServiceName[100]; mir_snprintf(szServiceName, SIZEOF(szServiceName), "/menuXStatus%d", i); CreateProtoServiceParam(szServiceName, &CMraProto::MraXStatusMenu, i); -- cgit v1.2.3