Show
Ignore:
Timestamp:
07/01/08 18:58:01 (5 months ago)
Author:
flynd
Message:

Marked old owner functions in user manager as deprecated. Updated daemon to use newer owner calls.

Files:
1 modified

Legend:

Unmodified
Added
Removed

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

    r6164 r6382  
    4949  m_szName = NULL; 
    5050  m_nPort = _nLocalPort; 
    51   m_nUin = gUserManager.OwnerUin(); 
    52   char szUin[24]; 
    53   sprintf(szUin, "%lu", m_nUin); 
    54   m_szId = strdup(szUin); 
     51  m_szId = strdup(gUserManager.OwnerId(LICQ_PPID).c_str()); 
     52  m_nUin = atol(m_szId); 
    5553  m_nPPID = LICQ_PPID; 
    5654  m_nColorForeRed = nColorForeRed; 
    … …  
    6664  buffer->PackUnsignedLong(0x65); 
    6765  buffer->PackUnsignedLong(-ICQ_VERSION_TCP); 
    68   buffer->PackUnsignedLong(gUserManager.OwnerUin()); 
     66  buffer->PackUnsignedLong(m_nUin); 
    6967  buffer->PackString(_sLocalName); 
    7068  buffer->PackUnsignedShort(ReversePort(_nLocalPort)); 
    … …  
    305303  m_szName = NULL; 
    306304  m_nPort = nLocalPort; 
    307   m_nUin = gUserManager.OwnerUin(); 
    308   char szUin[24]; 
    309   sprintf(szUin, "%lu", m_nUin); 
    310   m_szId = strdup(szUin); 
     305  m_szId = strdup(gUserManager.OwnerId(LICQ_PPID).c_str()); 
     306  m_nUin = atol(m_szId); 
    311307  m_nPPID = LICQ_PPID; 
    312308  m_nColorForeRed = nColorForeRed; 
    … …  
    332328 
    333329  buffer->PackUnsignedLong(0x65); 
    334   buffer->PackUnsignedLong(gUserManager.OwnerUin()); 
     330  buffer->PackUnsignedLong(m_nUin); 
    335331  buffer->PackString(szLocalName); 
    336332  buffer->PackChar(nColorForeRed); 
    … …  
    688684  licqDaemon = d; 
    689685 
    690   ICQOwner *o = gUserManager.FetchOwner(LOCK_R); 
     686  ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R); 
    691687  strncpy(m_szName, o->GetAlias(), 32); 
    692688  m_szName[31] = '\0'; 
    693689  m_nSession = o->Port(); 
    694   gUserManager.DropOwner(); 
     690  gUserManager.DropOwner(o); 
    695691 
    696692  m_nFontFace = FONT_PLAIN; 
    … …  
    813809  if (!bSuccess) 
    814810  { 
    815     ICQOwner *o = gUserManager.FetchOwner(LOCK_R); 
     811    ICQOwner* o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R); 
    816812    unsigned long nIp = bSendIntIp ? o->IntIp() : o->Ip(); 
    817     gUserManager.DropOwner(); 
    818    
     813    gUserManager.DropOwner(o); 
     814 
    819815    // try reverse connect 
    820816    int nId = licqDaemon->RequestReverseConnection(c->m_nUin, c->m_nSession,