Changeset 6306

Timestamp:

06/14/08 17:36:23 (7 months ago)

Author:

flynd

Message:

Changed some calls to not use uin functions.

Location:

trunk/licq

Files:

• include/licq_icqd.h (modified) (3 diffs)
• include/licq_packets.h (modified) (1 diff)
• src/fifo.cpp (modified) (2 diffs)
• src/icqd-srv.cpp (modified) (36 diffs)
• src/icqd-tcp.cpp (modified) (9 diffs)
• src/icqd-threads.cpp (modified) (1 diff)
• src/icqd.cpp (modified) (14 diffs)
• src/icqpacket.cpp (modified) (7 diffs)
• src/user.cpp (modified) (1 diff)

trunk/licq/include/licq_icqd.h

@@ -452 +452 @@
   void icqRequestAuth(unsigned long _nUin, const char *_szMessage);
   void icqAlertUser(unsigned long _nUin);
+  void icqAlertUser(const char* id, unsigned long ppid);
   void icqAddUser(unsigned long _nUin, bool _bAuthReq = false);
   void icqAddUser(const char *_szId, bool _bAuthReq = false);
@@ -785 +786 @@
   bool AddUserEvent(ICQUser *, CUserEvent *);
   void RejectEvent(unsigned long, CUserEvent *);
+  void RejectEvent(const char* id, CUserEvent* e);
   ICQUser *FindUserForInfoUpdate(const char *szId, ICQEvent *e, const char *);
   unsigned long FindUinByCellular(const char *_szCellular);
@@ -820 +822 @@
   ICQEvent *SendExpectEvent_Server(unsigned long nUin, CPacket *, CUserEvent *, bool = false);
   ICQEvent *SendExpectEvent_Server(const char *, unsigned long, CPacket *, CUserEvent *, bool = false);
+
+  ICQEvent* SendExpectEvent_Server(CPacket* packet, CUserEvent* ue, bool extendedEvent = false)
+  { return SendExpectEvent_Server("0", LICQ_PPID, packet, ue, extendedEvent); }
+
   ICQEvent *SendExpectEvent_Client(ICQUser *, CPacket *, CUserEvent *);
   ICQEvent *SendExpectEvent(ICQEvent *, void *(*fcn)(void *));

trunk/licq/include/licq_packets.h

@@ -816 +816 @@
   void InitBuffer();
 
-  unsigned long m_nUin, m_nMsgID[2];
+  unsigned long m_nMsgID[2];
   unsigned short m_nSequence, m_nMsgType, m_nStatus, m_nUinLen, m_nLevel;
   char m_szUin[13];

trunk/licq/src/fifo.cpp

@@ -305 +305 @@
         if( strcasecmp(s, pUser->GetAlias()) == 0)
         {
-          _szId = (char *) malloc(26);
-          if( _szId )
-          { 
-            sprintf(_szId, "%ld", pUser->Uin() );
-            ret = true;
-          }
+        _szId = strdup(pUser->IdString());
+        ret = true;
           FOR_EACH_PROTO_USER_BREAK
         }
@@ -593 +589 @@
     else
     {
-      unsigned long nUin = u->Uin();
       gUserManager.DropUser(u);
-      d->icqRequestMetaInfo(nUin);
+      d->icqRequestMetaInfo(szId);
       ret = 0;
     }

trunk/licq/src/icqd-srv.cpp

@@ -98 +98 @@
   gLog.Info(tr("%sAdding %s to server list...\n"), L_SRVxSTR, _szId);
   addToModifyUsers(pAdd->SubSequence(), _szId);
-  SendExpectEvent_Server(0, pAdd, NULL);
+  SendExpectEvent_Server(pAdd, NULL);
 
   CSrvPacketTcp *pEnd = new CPU_GenericFamily(ICQ_SNACxFAM_LIST,
@@ -221 +221 @@
   addToModifyUsers(pReply->SubSequence(), "");
   gLog.Info(tr("%sUpdating top level group.\n"), L_SRVxSTR);
-  SendExpectEvent_Server(0, pReply, NULL);
+  SendExpectEvent_Server(pReply, NULL);
 
   FOR_EACH_GROUP_START(LOCK_R)
@@ -232 +232 @@
       gLog.Info(tr("%sUpdating group %s.\n"), L_SRVxSTR, gname);
       addToModifyUsers(pReply->SubSequence(), "");
-      SendExpectEvent_Server(0, pReply, NULL);
+      SendExpectEvent_Server(pReply, NULL);
     }
   }
@@ -251 +251 @@
   gLog.Info(tr("%sAdding group %s (%d) to server list ...\n"), L_SRVxSTR, _szName, nGSID);
   addToModifyUsers(pAdd->SubSequence(), _szName);
-  SendExpectEvent_Server(0L, pAdd, NULL);
+  SendExpectEvent_Server(pAdd, NULL);
 }
 
@@ -288 +288 @@
                                                         nSID, _nOldType);
   addToModifyUsers(pRemove->SubSequence(), _szId);
-  SendExpectEvent_Server(0, pRemove, NULL);
+  SendExpectEvent_Server(pRemove, NULL);
 
   // Add the user, with the new group
@@ -294 +294 @@
                                                       _nNewGroup);
   addToModifyUsers(pAdd->SubSequence(), _szId);
-  SendExpectEvent_Server(0, pAdd, NULL);
+  SendExpectEvent_Server(pAdd, NULL);
 
 }
@@ -312 +312 @@
   // to add a flag to signify if it is a real user/group or a generic one.
   addToModifyUsers(pExport->SubSequence(), "");
-  SendExpectEvent_Server(0, pExport, NULL);
+  SendExpectEvent_Server(pExport, NULL);
   
   CSrvPacketTcp *pEnd = new CPU_GenericFamily(ICQ_SNACxFAM_LIST,
@@ -368 +368 @@
       pRemove = new CPU_RemoveFromServerList(_szId, nGSID, nSID, ICQ_ROSTxNORMAL);
     addToModifyUsers(pRemove->SubSequence(), _szId);
-    SendExpectEvent_Server(0, pRemove, NULL);
+    SendExpectEvent_Server(pRemove, NULL);
 
     if (nVisibleSID)
@@ -404 +404 @@
 void CICQDaemon::icqRemoveUser(unsigned long _nUin)
 {
-  // Remove from the SSList and update groups
-  if (UseServerContactList())
-  {
-    CSrvPacketTcp *pStart = new CPU_GenericFamily(ICQ_SNACxFAM_LIST,
-      ICQ_SNACxLIST_ROSTxEDITxSTART);
-    SendEvent_Server(pStart);
-
-    ICQUser *u = gUserManager.FetchUser(_nUin, LOCK_W);
-    unsigned short nGSID = u->GetGSID();
-    unsigned short nSID = u->GetSID();
-    char szUin[13];
-    snprintf(szUin, 12, "%lu", _nUin);
-    szUin[12] = '\0';
-    u->SetGSID(0);
-    gUserManager.DropUser(u);
-
-    CSrvPacketTcp *pRemove = new CPU_RemoveFromServerList(szUin, nGSID, nSID, ICQ_ROSTxNORMAL);
-    addToModifyUsers(pRemove->SubSequence(), szUin);
-    SendExpectEvent_Server(0, pRemove, NULL);
-  }
-
-  // Tell server they are no longer with us.
-  CSrvPacketTcp *p = new CPU_GenericUinList(_nUin, ICQ_SNACxFAM_BUDDY, ICQ_SNACxBDY_REMOVExFROMxLIST);
-  gLog.Info(tr("%sAlerting server to remove user (#%hu)...\n"), L_SRVxSTR,
-            p->Sequence());
-  SendExpectEvent_Server(_nUin, p, NULL);
+  char szUin[13];
+  snprintf(szUin, 12, "%lu", _nUin);
+  szUin[12] = 0;
+  icqRemoveUser(szUin);
 }
 
@@ -445 +423 @@
   gLog.Info(tr("%sRemoving group from server side list (%s)...\n"), L_SRVxSTR, _szName);
   addToModifyUsers(pRemove->SubSequence(), _szName);
-  SendExpectEvent_Server(0, pRemove, NULL);
+  SendExpectEvent_Server(pRemove, NULL);
 }
 
@@ -458 +436 @@
     _szNewName);
   addToModifyUsers(pUpdate->SubSequence(), _szNewName);
-  SendExpectEvent_Server(0, pUpdate, NULL);
+  SendExpectEvent_Server(pUpdate, NULL);
 }
 
@@ -491 +469 @@
   gLog.Info(tr("%sRenaming %s to %s...\n"), L_SRVxSTR, _szId, szNewAlias);
   addToModifyUsers(pUpdate->SubSequence(), _szId);
-  SendExpectEvent_Server(0, pUpdate, NULL);
+  SendExpectEvent_Server(pUpdate, NULL);
 }
 
 //-----icqAlertUser-------------------------------------------------------------
 void CICQDaemon::icqAlertUser(unsigned long _nUin)
+{
+  char szUin[13];
+  snprintf(szUin, 12, "%lu", _nUin);
+  szUin[12] = '\0';
+  icqAlertUser(szUin, LICQ_PPID);
+}
+
+void CICQDaemon::icqAlertUser(const char* id, unsigned long ppid)
 {
   ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
@@ -503 +489 @@
           o->GetAuthorization() ? '0' : '1', 0xFE);
   gUserManager.DropOwner();
-  CPU_ThroughServer *p = new CPU_ThroughServer(_nUin, ICQ_CMDxSUB_ADDEDxTOxLIST, sz);
+  CPU_ThroughServer *p = new CPU_ThroughServer(id, ICQ_CMDxSUB_ADDEDxTOxLIST, sz);
   gLog.Info(tr("%sAlerting user they were added (#%hu)...\n"), L_SRVxSTR, p->Sequence());
-  SendExpectEvent_Server(_nUin, p, NULL);
-}
-
+  SendExpectEvent_Server(id, ppid, p, NULL);
+}
 //-----icqFetchAutoResponseServer-----------------------------------------------
 unsigned long CICQDaemon::ProtoFetchAutoResponseServer(const char *_szId, unsigned long _nPPID)
@@ -578 +563 @@
             p->Sequence());
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -591 +576 @@
             p->Sequence());
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -622 +607 @@
   CPU_Register *p = new CPU_Register(m_szRegisterPasswd);
   gLog.Info(tr("%sRegistering a new user...\n"), L_SRVxSTR);
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     e->thread_plugin = m_nRegisterThreadId;
@@ -646 +631 @@
     szVerification);
    gLog.Info(tr("%sSending verification for registration.\n"), L_SRVxSTR);
-   
-   SendExpectEvent_Server(0, p, NULL);
+
+   SendExpectEvent_Server(p, NULL);
 }
 
@@ -832 +817 @@
   gLog.Info(tr("%sUpdating password (#%hu/#%d)...\n"), L_SRVxSTR,
             p->Sequence(), p->SubSequence());
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -881 +866 @@
   gLog.Info(tr("%sUpdating general info (#%hu/#%d)...\n"), L_SRVxSTR, p->Sequence(), p->SubSequence());
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -897 +882 @@
   gLog.Info(tr("%sUpdating additional E-Mail info (#%hu/#%d)...\n"), L_SRVxSTR, p->Sequence(), p->SubSequence());
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -918 +903 @@
   gLog.Info(tr("%sUpdating more info (#%hu/#%d)...\n"), L_SRVxSTR, p->Sequence(), p->SubSequence());
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent *e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -931 +916 @@
     p->Sequence(), p->SubSequence());
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -946 +931 @@
     L_SRVxSTR, p->Sequence(), p->SubSequence());
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -968 +953 @@
   gLog.Info(tr("%sUpdating work info (#%hu/#%d)...\n"), L_SRVxSTR, p->Sequence(), p->SubSequence());
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -985 +970 @@
   delete [] szAbout;
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -1057 +1042 @@
   delete [] sz;
 
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+  ICQEvent* e = SendExpectEvent_Server(p, NULL);
   if (e != NULL)
     return e->EventId();
@@ -1090 +1075 @@
     CPU_Meta_SetSecurityInfo *p = new CPU_Meta_SetSecurityInfo(bAuthorize, bHideIp, bWebAware);
     gLog.Info(tr("%sUpdating security info (#%hu/#%d)...\n"), L_SRVxSTR, p->Sequence(), p->SubSequence());
-    ICQEvent *e = SendExpectEvent_Server(0, p, NULL);
+    ICQEvent* e = SendExpectEvent_Server(p, NULL);
     if (e != NULL)
       return e->EventId();
@@ -1112 +1097 @@
   gLog.Info(tr("%sStarting white pages search (#%hu/#%d)...\n"), L_SRVxSTR,
             p->Sequence(), p->SubSequence());
-  ICQEvent *e = SendExpectEvent_Server(0, p, NULL, true);
+  ICQEvent *e = SendExpectEvent_Server(p, NULL, true);
   if (e != NULL)
     return e->EventId();
@@ -1124 +1109 @@
    gLog.Info(tr("%sStarting search by UIN for user (#%hu/#%d)...\n"), L_SRVxSTR, 
              p->Sequence(), p->SubSequence());
-   ICQEvent *e = SendExpectEvent_Server(0, p, NULL, true);
+   ICQEvent* e = SendExpectEvent_Server(p, NULL, true);
    if (e != NULL)
      return e->EventId();
@@ -1423 +1408 @@
     CSrvPacketTcp *pAdd = new CPU_AddToServerList(_szId, ICQ_ROSTxVISIBLE);
     addToModifyUsers(pAdd->SubSequence(), _szId);
-    SendExpectEvent_Server(0, pAdd, NULL);
+    SendExpectEvent_Server(pAdd, NULL);
   }
 }
@@ -2373 +2358 @@
       gLog.Info(tr("%sRequesting list rights.\n"), L_SRVxSTR);
       p = new CPU_ListRequestRights();
-      SendExpectEvent_Server(0, p, NULL);
+      SendExpectEvent_Server(p, NULL);
 
       gLog.Info(tr("%sRequesting roster rights.\n"), L_SRVxSTR);
@@ -3230 +3215 @@
       if (ignore)
       {
-        RejectEvent(strtoul(szId, (char **)NULL, 10), e);
+        RejectEvent(szId, e);
         break;
       }
@@ -3796 +3781 @@
 
           //TODO
-          RejectEvent(strtoul(szId, (char **)NULL, 10), eEvent);
+          RejectEvent(szId, eEvent);
           break;
         }
@@ -4554 +4539 @@
               }
               addToModifyUsers(pReply->SubSequence(), groupName);
-              SendExpectEvent_Server(0, pReply, NULL);
+              SendExpectEvent_Server(pReply, NULL);
 
               // Finish editing server list
@@ -4594 +4579 @@
                   ICQ_ROSTxNORMAL, 0, true);
                 addToModifyUsers(pReply->SubSequence(), pending);
-                SendExpectEvent_Server(0, pReply, NULL);
+                SendExpectEvent_Server(pReply, NULL);
               }
             }
@@ -5613 +5598 @@
 
           if (bNewUser)
-          {
-            icqRequestMetaInfo(nUin);
-          }
+            icqRequestMetaInfo(szUin);
 
           e->m_pSearchAck = new CSearchAck(nUin);

trunk/licq/src/icqd-tcp.cpp

@@ -682 +682 @@
   {
     CPU_InfoPluginReq *p = new CPU_InfoPluginReq(u, GUID, 0);
-    result = SendExpectEvent_Server(u->Uin(), p, NULL);
+    result = SendExpectEvent_Server(u->IdString(), u->PPID(), p, NULL);
   }
   else
@@ -1063 +1063 @@
               u->GetAlias(), -p->Sequence());
 
-        result = SendExpectEvent_Server(u->Uin(), p, e);
+        result = SendExpectEvent_Server(u->IdString(), u->PPID(), p, e);
     }
     else
@@ -1578 +1578 @@
 
   char szAlias[64];
-  snprintf(szAlias, sizeof(szAlias), "%s (%lu)", u->GetAlias(), u->Uin());
+  snprintf(szAlias, sizeof(szAlias), "%s (%s)", u->GetAlias(), u->IdString());
   szAlias[sizeof(szAlias) - 1] = '\0';
   unsigned long ip = u->Ip();
@@ -1916 +1916 @@
   if (u->SocketDesc(pSock->Channel()) != sockfd)
   {
-    gLog.Warn("%sUser %s (%lu) socket (%d) does not match incoming message (%d).\n",
-              L_TCPxSTR, u->GetAlias(), u->Uin(),
+    gLog.Warn("%sUser %s (%s) socket (%d) does not match incoming message (%d).\n",
+              L_TCPxSTR, u->GetAlias(), u->IdString(),
               u->SocketDesc(pSock->Channel()), sockfd);
   }
@@ -2017 +2017 @@
       bool r = u->OfflineOnDisconnect() || u->StatusOffline();
       ChangeUserStatus(u, (u->StatusFull() & ICQ_STATUS_FxFLAGS) | ns);
-      gLog.Info(tr("%s%s (%ld) is %s to us.\n"), L_TCPxSTR, u->GetAlias(),
-         u->Uin(), u->StatusStr());
+      gLog.Info(tr("%s%s (%s) is %s to us.\n"), L_TCPxSTR, u->GetAlias(),
+         u->IdString(), u->StatusStr());
       if (r) u->SetOfflineOnDisconnect(true);
     }
@@ -3303 +3303 @@
 
             PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_PICTURE,
-                                 u->Uin()));
-
-            
+                u->IdString(), u->PPID()));
           }
           else if (memcmp(GUID, PLUGIN_QUERYxINFO, GUID_LENGTH) == 0)
@@ -3431 +3429 @@
 
             PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_PHONExBOOK,
-                                 u->Uin()));
+                u->IdString(), u->PPID()));
 
             break;
@@ -3472 +3470 @@
 
             PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_PICTURE,
-                                 u->Uin()));
+                u->IdString(), u->PPID()));
 
             break;
@@ -3754 +3752 @@
 
         // Which plugin?
-        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER,
-                                        USER_PLUGIN_STATUS, u->Uin(), 0));
+        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_PLUGIN_STATUS,
+            u->IdString(), u->PPID(), 0));
 
         ProcessDoneEvent(e);

trunk/licq/src/icqd-threads.cpp

@@ -1002 +1002 @@
             && pUser->ClientTimestamp() != 0)
         {
-          d->icqRequestMetaInfo(pUser->Uin());
+          d->icqRequestMetaInfo(pUser->IdString());
           bSent = true;
         }

trunk/licq/src/icqd.cpp

@@ -1208 +1208 @@
   if (nUin == 0) return false;
 
-  // Don't add a user we already have
-  if (gUserManager.IsOnList(nUin))
-  {
-    gLog.Warn(tr("%sUser %lu already on contact list.\n"), L_WARNxSTR, nUin);
-    return false;
-  }
-
-  ICQUser *u = new ICQUser(nUin);
-  gUserManager.AddUser(u);
-  gUserManager.DropUser(u);
-  SaveUserList();
-
-  // this notify is for local only adds
-  if (m_nTCPSrvSocketDesc != -1 && bNotify)  icqAddUser(nUin);
-
-  PushPluginSignal(new CICQSignal(SIGNAL_UPDATExLIST, LIST_ADD, nUin));
-
-  return true;
+  char szUin[24];
+  sprintf(szUin, "%lu", nUin);
+  return AddUserToList(szUin, LICQ_PPID, bNotify);
 }
 
@@ -1268 +1253 @@
 void CICQDaemon::RemoveUserFromList(unsigned long _nUin)
 {
-  if (m_nTCPSrvSocketDesc != -1) icqRemoveUser(_nUin);
-
-  gUserManager.RemoveUser(_nUin);
-  SaveUserList();
-
-  PushPluginSignal(new CICQSignal(SIGNAL_UPDATExLIST, LIST_REMOVE, _nUin));
+  char szUin[24];
+  sprintf(szUin, "%lu", _nUin);
+  RemoveUserFromList(szUin, LICQ_PPID);
 }
 
@@ -1370 +1352 @@
 void CICQDaemon::RejectEvent(unsigned long nUin, CUserEvent *e)
 {
+  char szUin[24];
+  sprintf(szUin, "%lu", nUin);
+  RejectEvent(szUin, e);
+}
+
+void CICQDaemon::RejectEvent(const char* id, CUserEvent* e)
+{
   if (m_szRejectFile == NULL) return;
 
@@ -1379 +1368 @@
   else
   {
-    fprintf(f, "Event from new user (%lu) rejected: \n%s\n--------------------\n\n",
-            nUin, e->Text());
+    fprintf(f, "Event from new user (%s) rejected: \n%s\n--------------------\n\n",
+        id, e->Text());
     chmod(m_szRejectFile, 00600);
     fclose(f);
@@ -1478 +1467 @@
    CUserEvent *ue, bool bExtendedEvent)
 {
+  char szUin[24];
+  sprintf(szUin, "%lu", nUin);
+  return SendExpectEvent_Server(szUin, LICQ_PPID, packet, ue, bExtendedEvent);
+}
+
+ICQEvent *CICQDaemon::SendExpectEvent_Client(ICQUser *pUser, CPacket *packet,
+   CUserEvent *ue)
+{
   // If we are already shutting down, don't start any events
   if (m_bShuttingDown)
@@ -1487 +1484 @@
 
   if (ue != NULL) ue->m_eDir = D_SENDER;
-  ICQEvent *e = new ICQEvent(this, m_nTCPSrvSocketDesc, packet, CONNECT_SERVER, nUin, ue);
-
-  if (e == NULL)  return NULL;
-
-  if (bExtendedEvent) PushExtendedEvent(e);
-
-  ICQEvent *result = SendExpectEvent(e, &ProcessRunningEvent_Server_tep);
-
-  // if an error occured, remove the event from the extended queue as well
-  if (result == NULL && bExtendedEvent)
-  {
-    pthread_mutex_lock(&mutex_extendedevents);
-    std::list<ICQEvent *>::iterator i;
-    for (i = m_lxExtendedEvents.begin(); i != m_lxExtendedEvents.end(); ++i)
-    {
-      if (*i == e)
-      {
-        m_lxExtendedEvents.erase(i);
-        break;
-      }
-    }
-    pthread_mutex_unlock(&mutex_extendedevents);
-  }
-
-  return result;
-}
-
-
-ICQEvent *CICQDaemon::SendExpectEvent_Client(ICQUser *pUser, CPacket *packet,
-   CUserEvent *ue)
-{
-  // If we are already shutting down, don't start any events
-  if (m_bShuttingDown)
-  {
-    if (packet != NULL) delete packet;
-    if (ue != NULL) delete ue;
-    return NULL;
-  }
-
-  if (ue != NULL) ue->m_eDir = D_SENDER;
   ICQEvent *e = new ICQEvent(this, pUser->SocketDesc(packet->Channel()), packet,
-     CONNECT_USER, pUser->Uin(), ue);
+     CONNECT_USER, pUser->IdString(), pUser->PPID(), ue);
 
   if (e == NULL) return NULL;
@@ -2281 +2238 @@
     icqChatRequestCancel(e->m_nDestinationUin, e->m_nSequence);
   else if (e->m_nSubCommand == ICQ_CMDxSUB_FILE)
-    icqFileTransferCancel(e->m_nDestinationUin, e->m_nSequence);
+    icqFileTransferCancel(e->Id(), e->m_nSequence);
   else if (e->m_nSubCommand == ICQ_CMDxSUB_SECURExOPEN)
-    icqOpenSecureChannelCancel(e->m_nDestinationUin, e->m_nSequence);
+    icqOpenSecureChannelCancel(e->Id(), e->m_nSequence);