Changeset 6355

Timestamp:

06/21/08 11:39:37 (4 months ago)

Author:

eugene

Message:

Made a step toward proper server-side vs local group synchronization.

Location:

trunk/licq/src

Files:

• icqd-srv.cpp (modified) (3 diffs)
• icqpacket.cpp (modified) (2 diffs)

trunk/licq/src/icqd-srv.cpp

@@ -4237 +4237 @@
               }
 
+              u->RemoveFromGroup(GROUPS_USER, gUserManager.GetGroupFromID(u->GetGSID()));
               u->SetGSID(nTag);
+              u->AddToGroup(GROUPS_USER, gUserManager.GetGroupFromID(nTag));
 
               if (szNewName)
@@ -4411 +4413 @@
         // First update their gsid/sid
         u->SetSID(sid);
+        u->RemoveFromGroup(GROUPS_USER, gUserManager.GetGroupFromID(u->GetGSID()));
         u->SetGSID(gsid);
+        u->AddToGroup(GROUPS_USER, gUserManager.GetGroupFromID(gsid));
 
         // Now the the tlv of attributes to attach to the user
@@ -4422 +4426 @@
         }
 
+        u->SaveLicqInfo();
+        PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_GENERAL,
+              u->IdString(), u->PPID()));
         gUserManager.DropUser(u);
       }

trunk/licq/src/icqpacket.cpp

@@ -2833 +2833 @@
         if (m_nGSID == 0)
           m_nGSID = 1; // Must never actually reach this point
+
+        u->AddToGroup(GROUPS_USER, gUserManager.GetGroupFromID(m_nGSID));
       }
 
@@ -3028 +3030 @@
       SetExtraInfo(m_nGSID);
       u->SetGSID(m_nGSID);
+      u->AddToGroup(GROUPS_USER, gUserManager.GetGroupFromID(m_nGSID));
       gUserManager.DropUser(u);