diff options
author | George Hazan <george.hazan@gmail.com> | 2015-08-13 17:08:34 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-08-13 17:08:34 +0000 |
commit | 1ea84dc56d95ceaf85c036127c5045eba0ad50ee (patch) | |
tree | a8392d1877470f4d7513e3ad853fa843d564a544 /protocols/AimOscar/src/proxy.cpp | |
parent | 5c84f735bc4f40d3f2f645d003ef9a08576878d8 (diff) |
massive name conflict resolution
git-svn-id: http://svn.miranda-ng.org/main/trunk@14941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/AimOscar/src/proxy.cpp')
-rw-r--r-- | protocols/AimOscar/src/proxy.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/AimOscar/src/proxy.cpp b/protocols/AimOscar/src/proxy.cpp index 3ed34d54af..35076518ae 100644 --- a/protocols/AimOscar/src/proxy.cpp +++ b/protocols/AimOscar/src/proxy.cpp @@ -24,12 +24,12 @@ void __cdecl CAimProto::aim_proxy_helper(void* param) if (ft->requester)
{
- if (proxy_initialize_send(ft->hConn, username, ft->icbm_cookie))
+ if (proxy_initialize_send(ft->hConn, m_username, ft->icbm_cookie))
return;//error
}
else
{
- if (proxy_initialize_recv(ft->hConn, username, ft->icbm_cookie, ft->port))
+ if (proxy_initialize_recv(ft->hConn, m_username, ft->icbm_cookie, ft->port))
return;//error
}
@@ -89,14 +89,14 @@ void __cdecl CAimProto::aim_proxy_helper(void* param) unsigned short port = _htons(*(unsigned short*)&packetRecv.buffer[12]);
unsigned long ip = _htonl(*(unsigned long*)&packetRecv.buffer[14]);
- aim_send_file(hServerConn, seqno, ip, port, true, ft);
+ aim_send_file(m_hServerConn, m_seqno, ip, port, true, ft);
debugLogA("Stage %d Proxy ft and we are not the sender.", ft->req_num);
}
else if (type == 0x0005)
{
if (!ft->requester)
{
- aim_file_ad(hServerConn, seqno, ft->sn, ft->icbm_cookie, false, ft->max_ver);
+ aim_file_ad(m_hServerConn, m_seqno, ft->sn, ft->icbm_cookie, false, ft->max_ver);
ft->accepted = true;
}
@@ -131,7 +131,7 @@ void __cdecl CAimProto::aim_proxy_helper(void* param) Netlib_CloseHandle(hServerPacketRecver);
Netlib_CloseHandle(ft->hConn);
- ft_list.remove_by_ft(ft);
+ m_ft_list.remove_by_ft(ft);
}
|