Changeset 6335

Timestamp:

06/18/08 01:14:55 (6 months ago)

Author:

eugene

Message:

Don't forget to propogate group id which we intend to add the user to.

Location:

trunk/licq

Files:

• include/licq_icqd.h (modified) (1 diff)
• src/icqd-srv.cpp (modified) (4 diffs)

trunk/licq/include/licq_icqd.h

@@ -454 +454 @@
   void icqAlertUser(unsigned long _nUin);
   void icqAlertUser(const char* id, unsigned long ppid);
-  void icqAddUser(unsigned long _nUin, bool _bAuthReq = false);
+  void icqAddUser(unsigned long _nUin, bool _bAuthReq = false, unsigned short groupId = 0);
   void icqAddUser(const char *_szId, bool _bAuthReq = false, unsigned short groupId = 0);
   void icqAddUserServer(const char *_szId, bool _bAuthReq, unsigned short groupId = 0);
-  void icqAddUserServer(unsigned long _nUin, bool _bAuthReq);
+  void icqAddUserServer(unsigned long _nUin, bool _bAuthReq, unsigned short groupId = 0);
   void icqAddGroup(const char *);
   void icqRemoveUser(unsigned long _nUin);

trunk/licq/src/icqd-srv.cpp

@@ -65 +65 @@
   if (UseServerContactList())
   {
-    icqAddUserServer(_szId, _bAuthRequired);
+    icqAddUserServer(_szId, _bAuthRequired, groupId);
   }
 
@@ -71 +71 @@
 }
 
-void CICQDaemon::icqAddUser(unsigned long _nUin, bool _bAuthRequired)
+void CICQDaemon::icqAddUser(unsigned long _nUin, bool _bAuthRequired, unsigned short groupId)
 {
   char szUin[24];
   sprintf(szUin, "%lu", _nUin);
 
-  icqAddUser(szUin, _bAuthRequired);
+  icqAddUser(szUin, _bAuthRequired, groupId);
 }
 
@@ -106 +106 @@
 }
 
-void CICQDaemon::icqAddUserServer(unsigned long _nUin, bool _bAuthRequired)
+void CICQDaemon::icqAddUserServer(unsigned long _nUin, bool _bAuthRequired,
+    unsigned short groupId)
 {
   char szUin[13];
@@ -112 +113 @@
   szUin[12] = 0;
 
-  icqAddUserServer(szUin, _bAuthRequired);
+  icqAddUserServer(szUin, _bAuthRequired, groupId);
 }