diff options
author | George Hazan <george.hazan@gmail.com> | 2013-07-20 10:08:52 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-07-20 10:08:52 +0000 |
commit | f946ebcb1ac09b7220f8547074496aa2d1b83768 (patch) | |
tree | 30af27bf909684e191b08f6939e80eed51ce3efb /protocols/JabberG/src/jabber_svc.cpp | |
parent | 0b39e2b4ed0b578040a1eb584d045c6202885f7d (diff) |
- indexes replaces with pointers;
- members' name normalization
git-svn-id: http://svn.miranda-ng.org/main/trunk@5425 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_svc.cpp')
-rw-r--r-- | protocols/JabberG/src/jabber_svc.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index d68296ca32..a6780f4f63 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -400,7 +400,7 @@ INT_PTR __cdecl CJabberProto::JabberGCGetToolTipText(WPARAM wParam, LPARAM lPara JABBER_RESOURCE_STATUS * info = NULL;
for (int i=0; i < item->resourceCount; i++) {
- JABBER_RESOURCE_STATUS& p = item->resource[i];
+ JABBER_RESOURCE_STATUS& p = item->pResources[i];
if ( !lstrcmp(p.resourceName, (TCHAR*)lParam)) {
info = &p;
break;
@@ -819,7 +819,7 @@ LPTSTR CJabberSysInterface::GetResourceList(LPCTSTR jid) return NULL;
}
- if (item->resource == NULL) {
+ if (item->pResources == NULL) {
m_psProto->ListUnlock();
return NULL;
}
@@ -827,16 +827,15 @@ LPTSTR CJabberSysInterface::GetResourceList(LPCTSTR jid) int i;
int iLen = 1; // 1 for extra zero terminator at the end of the string
// calculate total necessary string length
- for (i=0; i<item->resourceCount; i++) {
- iLen += lstrlen(item->resource[i].resourceName) + 1;
- }
+ for (i=0; i<item->resourceCount; i++)
+ iLen += lstrlen(item->pResources[i].resourceName) + 1;
// allocate memory and fill it
LPTSTR str = (LPTSTR)mir_alloc(iLen * sizeof(TCHAR));
LPTSTR p = str;
for (i=0; i<item->resourceCount; i++) {
- lstrcpy(p, item->resource[i].resourceName);
- p += lstrlen(item->resource[i].resourceName) + 1;
+ lstrcpy(p, item->pResources[i].resourceName);
+ p += lstrlen(item->pResources[i].resourceName) + 1;
}
*p = 0; // extra zero terminator
|