Changeset 6283 for trunk/qt4-gui/src/core/usermenu.cpp

Timestamp:

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

Author:

flynd

Message:

Updated to work with and take advantage of new group handling. Contact list model is now properly updated from signals when groups change.

Files:

• trunk/qt4-gui/src/core/usermenu.cpp (modified) (4 diffs)

trunk/qt4-gui/src/core/usermenu.cpp

@@ -206 +206 @@
     delete a;
 
-  GroupList* g = gUserManager.LockGroupList(LOCK_R);
-  for (unsigned int i = 0; i < g->size(); ++i)
-  {
-    QString name = QString::fromLocal8Bit((*g)[i]);
+  FOR_EACH_GROUP_START_SORTED(LOCK_R)
+  {
+    QString name = QString::fromLocal8Bit(pGroup->name().c_str());
 
     a = myUserGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
 
     a = myServerGroupActions->addAction(name);
-    a->setData(i + 1);
+    a->setData(pGroup->id());
     a->setCheckable(true);
   }
-  gUserManager.UnlockGroupList();
+  FOR_EACH_GROUP_END
 
   // Add groups to menu
@@ -552 +551 @@
   gUserManager.SetUserInGroup(myId.toLatin1(), myPpid, GROUPS_USER, gid,
       action->isChecked(), false);
-
-  // The daemon does not send an update when group membership changes
-  // so tell the contactList it needs to update
-  LicqGui::instance()->contactList()->updateUser(myId, myPpid);
 }
 
@@ -578 +573 @@
   gUserManager.SetUserInGroup(myId.toLatin1(), myPpid, GROUPS_SYSTEM, gid,
       action->isChecked(), true);
-
-  // The daemon does not send an update when group membership changes
-  // so tell the contactList it needs to update
-  LicqGui::instance()->contactList()->updateUser(myId, myPpid);
 }
 
@@ -588 +579 @@
   unsigned int gid = action->data().toUInt();
   gUserManager.SetUserInGroup(myId.toLatin1(), myPpid, GROUPS_USER, gid, true, true);
-
-  // The daemon does not send an update when group membership changes
-  // so tell the contactList it needs to update
-  LicqGui::instance()->contactList()->updateUser(myId, myPpid);
-}
+}