Changeset 6299

Timestamp:

06/14/08 10:45:33 (5 months ago)

Author:

eugene

Message:

Removed default group configuration from the daemon, since it's UI-specific property.

Location:

trunk/licq

Files:

• include/licq_user.h (modified) (2 diffs)
• src/licq.conf.h (modified) (1 diff)
• src/user.cpp (modified) (3 diffs)

trunk/licq/include/licq_user.h

@@ -1503 +1503 @@
   unsigned short NumUsers();
   unsigned short NumOwners();
-  unsigned short DefaultGroup()  { return m_nDefaultGroup; }
-  void SetDefaultGroup(unsigned short n)  { m_nDefaultGroup = n; SaveGroups(); }
   unsigned short NewUserGroup()  { return m_nNewUserGroup; }
   void SetNewUserGroup(unsigned short n)  { m_nNewUserGroup = n; SaveGroups(); }
@@ -1517 +1515 @@
   ICQOwner *m_xOwner;
   unsigned long m_nOwnerUin;
-  unsigned short m_nDefaultGroup;
   unsigned short m_nNewUserGroup;
   unsigned short m_nUserListLockType;

trunk/licq/src/licq.conf.h

@@ -40 +40 @@
 "[groups]\n"
 "NumOfGroups = 0\n"
-"DefaultGroup = 0\n"
 "NewUserGroup = 0\n"
 "\n"

trunk/licq/src/user.cpp

@@ -631 +631 @@
   UnlockGroupList();
 
-  licqConf.ReadNum("DefaultGroup", m_nDefaultGroup, 0);
-  if (m_nDefaultGroup >= 1024)
-      m_nDefaultGroup = 0;
   licqConf.ClearFlag(INI_FxFATAL);
   licqConf.ReadNum("NewUserGroup", m_nNewUserGroup, 0);
@@ -950 +947 @@
   delete group;
 
-  if (m_nDefaultGroup == groupId)
-    m_nDefaultGroup = 0;
   if (m_nNewUserGroup == groupId)
     m_nNewUserGroup = 0;
@@ -1111 +1106 @@
   }
 
-  licqConf.WriteNum("DefaultGroup", m_nDefaultGroup);
   licqConf.WriteNum("NewUserGroup", m_nNewUserGroup);
   licqConf.FlushFile();