diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-06-18 21:16:39 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-06-18 21:16:39 +0000 |
| commit | 0a749321d05905e3d6396b053cbe8b208e7e4aa6 (patch) | |
| tree | 69714092cf8ebe892bf79c56f1641ecfa701cfb5 /protocols/JabberG/src/jabber_menu.cpp | |
| parent | e74376e044f745e7efdbb6bcd3d8c1de5d46d470 (diff) | |
minor code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@5029 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_menu.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_menu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 27fe6b7b40..5ae47f809b 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -291,12 +291,12 @@ void g_MenuInit(void) mi.icolibItem = g_GetIconHandle(IDI_NOTES);
g_hMenuDirectPresence[0] = Menu_AddContactMenuItem(&mi);
- mi.flags |= CMIF_ROOTHANDLE;
+ mi.flags |= CMIF_ROOTHANDLE | CMIF_TCHAR;
for (int i = 0; i < SIZEOF(PresenceModeArray); i++) {
char buf[] = "Jabber/DirectPresenceX";
buf[SIZEOF(buf)-2] = '0' + i;
mi.pszService = buf;
- mi.pszName = (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, PresenceModeArray[i].mode, 0);
+ mi.ptszName = pcli->pfnGetStatusModeDescription(PresenceModeArray[i].mode, 0);
mi.position = -1999901000;
mi.hParentMenu = g_hMenuDirectPresence[0];
mi.icolibItem = LoadSkinnedIcon(PresenceModeArray[i].icon);
@@ -304,7 +304,7 @@ void g_MenuInit(void) CreateServiceFunctionParam(mi.pszService, JabberMenuHandleDirectPresence, PresenceModeArray[i].mode);
}
- mi.flags &= ~CMIF_ROOTHANDLE;
+ mi.flags &= ~(CMIF_ROOTHANDLE | CMIF_TCHAR);
// Resource selector
mi.pszService = "Jabber/ResourceSelectorDummySvc";
@@ -466,7 +466,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM) }
mir_sntprintf(szTmp, SIZEOF(szTmp), _T("%s [%s, %d]"),
item->resource[i].resourceName,
- (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, item->resource[i].status, GSMDF_TCHAR),
+ pcli->pfnGetStatusModeDescription(item->resource[i].status, 0),
item->resource[i].priority);
clmi.ptszName = szTmp;
Menu_ModifyItem(m_phMenuResourceItems[i], &clmi);
|