Changeset 6285 for trunk/console

Timestamp:

06/14/08 03:49:08 (6 months ago)

Author:

flynd

Message:

Updated to work with new group handling. I haven't tested this much but it compiles, starts and seems to work.

Location:

trunk/console/src

Files:

• console.cpp (modified) (1 diff)
• console_menu.cpp (modified) (1 diff)
• console_print.cpp (modified) (1 diff)

trunk/console/src/console.cpp

@@ -1496 +1496 @@
     else
     {
-      GroupList *g = gUserManager.LockGroupList(LOCK_R);
-      if (m_nCurrentGroup > g->size())
+      LicqGroup* group = gUserManager.FetchGroup(m_nCurrentGroup, LOCK_R);
+      if (group == NULL)
         strcpy(szGroupName, "Invalid Group");
       else
-        strcpy(szGroupName, (*g)[m_nCurrentGroup - 1]);
-      gUserManager.UnlockGroupList();
+        strcpy(szGroupName, group->name().c_str());
+      gUserManager.DropGroup(group);
     }
   }

trunk/console/src/console_menu.cpp

@@ -389 +389 @@
     nGroupType = GROUPS_USER;
     nCurrentGroup = atol(_szArg);
-
-    if (nCurrentGroup > gUserManager.NumGroups())
-    {
-      winMain->wprintf("%CInvalid group number (0 - %d)\n", COLOR_RED,
-                       gUserManager.NumGroups());
+    LicqGroup* group = gUserManager.FetchGroup(nCurrentGroup, LOCK_R);
+
+    if (nCurrentGroup != 0 && group == NULL)
+    {
+      winMain->wprintf("%CInvalid group number\n", COLOR_RED);
       return;
     }
     m_nCurrentGroup = nCurrentGroup;
     m_nGroupType = nGroupType;
-    GroupList *g = gUserManager.LockGroupList(LOCK_R);
     winMain->wprintf("%C%ASwitching to group %d (%s).\n",
                      m_cColorInfo->nColor, m_cColorInfo->nAttr,
                      m_nCurrentGroup,
-                     m_nCurrentGroup == 0 ? "All Users" : (*g)[m_nCurrentGroup - 1]);
-    gUserManager.UnlockGroupList();
+                     m_nCurrentGroup == 0 ? "All Users" : group->name().c_str());
+    gUserManager.DropGroup(group);
   }
 

trunk/console/src/console_print.cpp

@@ -204 +204 @@
   waddch(winMain->Win(), '\n');
 
-  GroupList *g = gUserManager.LockGroupList(LOCK_R);
-  for (GroupList::iterator i = g->begin(); i != g->end(); i++, j++)
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
   {
     PrintBoxLeft();
     winMain->wprintf("%A%C%3d. %-19s",
         m_cColorGroupList->nAttr,
-        m_cColorGroupList->nColor, j, *i);
+        m_cColorGroupList->nColor, j, pGroup->name().c_str());
     PrintBoxRight(26);
-  }
-  gUserManager.UnlockGroupList();
+    ++j;
+  }
+  FOR_EACH_GROUP_END
 
   waddch(winMain->Win(), ACS_LTEE);