Changeset 6336 for trunk/qt4-gui/src/config

Timestamp:

06/18/08 03:53:51 (6 months ago)

Author:

eugene

Message:

Changed default values for startup group to All Users. Made read values to be validated.

Files:

• trunk/qt4-gui/src/config/contactlist.cpp (modified) (2 diffs)

trunk/qt4-gui/src/config/contactlist.cpp

@@ -24 +24 @@
 
 #include <licq_file.h>
+#include <licq_user.h>
 
 using namespace LicqQtGui;
@@ -69 +70 @@
 
   unsigned short groupType;
-  iniFile.ReadNum("StartUpGroupId", myGroupId, 0);
-  iniFile.ReadNum("StartUpGroupType", groupType, GROUPS_USER);
+  iniFile.ReadNum("StartUpGroupId", myGroupId, GROUP_ALL_USERS);
+  iniFile.ReadNum("StartUpGroupType", groupType, GROUPS_SYSTEM);
   myGroupType = static_cast<GroupType>(groupType);
+
+  if ((myGroupType == GROUPS_USER && myGroupId > gUserManager.NumGroups()) ||
+      (myGroupType == GROUPS_SYSTEM && myGroupId >= NUM_GROUPS_SYSTEM_ALL) ||
+      (myGroupType != GROUPS_USER && myGroupType != GROUPS_SYSTEM))
+  {
+    myGroupId = GROUP_ALL_USERS;
+    myGroupType = GROUPS_SYSTEM;
+  }
 
   iniFile.ReadNum("NumColumns", myColumnCount, 1);