summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_adhoc.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-09-21 16:26:45 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-09-21 16:26:45 +0000
commitd8850660bcbec0677f4b550f716b9d2632e4d970 (patch)
tree3d827873697d32cbc1460acdac46055876c61d65 /protocols/JabberG/src/jabber_adhoc.cpp
parente3ec1c46bc13ec4423ce51f36939121e6128d791 (diff)
- variables/fields names' conflict resolved;
- members names standardization; - code cleaning; git-svn-id: http://svn.miranda-ng.org/main/trunk@6162 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_adhoc.cpp')
-rw-r--r--protocols/JabberG/src/jabber_adhoc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 8d5c743f6d..a7e1d5378d 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -550,7 +550,7 @@ int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM wParam, LPARAM lParam)
if (item->arResources.getCount() > 1) {
HMENU hMenu = CreatePopupMenu();
for (int i=0; i < item->arResources.getCount(); i++)
- AppendMenu(hMenu,MF_STRING,i+1, item->arResources[i]->resourceName);
+ AppendMenu(hMenu,MF_STRING,i+1, item->arResources[i]->m_tszResourceName);
HWND hwndTemp = CreateWindowEx(WS_EX_TOOLWINDOW,_T("button"),_T("PopupMenuHost"),0,0,0,10,10,NULL,NULL,hInst,NULL);
SetForegroundWindow(hwndTemp);
RECT rc;
@@ -566,7 +566,7 @@ int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM wParam, LPARAM lParam)
JABBER_RESOURCE_STATUS *r = item->arResources[selected-1];
if (r) {
_tcsncat(jid, _T("/"),SIZEOF(jid));
- _tcsncat(jid, r->resourceName, SIZEOF(jid));
+ _tcsncat(jid, r->m_tszResourceName, SIZEOF(jid));
}
selected = 1;
}