Changeset 4922 for trunk/licq/src/icqd-srv.cpp

Timestamp:

05/18/07 06:24:32 (19 months ago)

Author:

emostar

Message:

Remove the user from the invisible list as well when we delete a user.
Fixes #694

Files:

• trunk/licq/src/icqd-srv.cpp (modified) (2 diffs)

trunk/licq/src/icqd-srv.cpp

@@ -396 +396 @@
 
     ICQUser *u = gUserManager.FetchUser(_szId, LICQ_PPID, LOCK_W);
+    // When we remove a user, we remove them from all parts of the list:
+    // Visible, Invisible and Ignore lists as well.
     unsigned short nGSID = u->GetGSID();
     unsigned short nSID = u->GetSID();
     unsigned short nVisibleSID = u->GetVisibleSID();
+    unsigned short nInvisibleSID = u->GetInvisibleSID();
     bool bIgnored = u->IgnoreList();
     u->SetGSID(0);
     u->SetVisibleSID(0);
+    u->SetInvisibleSID(0);
     u->SetVisibleList(false);
+    u->SetInvisibleList(false);
     u->SaveLicqInfo();
     gUserManager.DropUser(u);
@@ -422 +427 @@
         nVisibleSID, ICQ_ROSTxVISIBLE);
       SendEvent_Server(pVisRemove);
+    }
+
+    if (nInvisibleSID)
+    {
+      CSrvPacketTcp *pInvisRemove = new CPU_RemoveFromServerList(_szId, 0,
+          nInvisibleSID, ICQ_ROSTxINVISIBLE);
+      SendEvent_Server(pInvisRemove);
     }
   }