Show
Ignore:
Timestamp:
07/03/08 05:54:19 (5 months ago)
Author:
flynd
Message:

More uin calls removed or rewritten.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/licq/src/icqd-chat.cpp

    r6401 r6402  
    816816 
    817817    // try reverse connect 
    818     int nId = licqDaemon->RequestReverseConnection(c->m_nUin, c->m_nSession, 
     818    int nId = licqDaemon->RequestReverseConnection(c->m_szId, c->m_nSession, 
    819819                                                 nIp, LocalPort(), c->m_nPort); 
    820820    if (nId != -1) 
    … …  
    854854 
    855855  // Send handshake packet: 
    856   if (!CICQDaemon::Handshake_Send(&u->sock, c->m_nUin, LocalPort(), 
     856  if (!CICQDaemon::Handshake_Send(&u->sock, c->m_szId, LocalPort(), 
    857857     VersionToUse(c->m_nVersion), false)) 
    858858    return false; 
    … …  
    985985                         iter != licqDaemon->m_lReverseConnect.end();  ++iter) 
    986986        { 
    987           if ((*iter)->nUin == u->uin) 
     987          if ((*iter)->myIdString == u->Id()) 
    988988          { 
    989989            bFound = true; 
    … …  
    24642464  pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); 
    24652465  gLog.Info("%sChat: Waiting for reverse connection.\n", L_TCPxSTR); 
    2466   bool bConnected = d->WaitForReverseConnection(rc->nId, rc->u->Uin()); 
     2466  bool bConnected = d->WaitForReverseConnection(rc->nId, rc->u->Id()); 
    24672467  pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); 
    24682468