Changeset 6259 for branches/qt4-gui_group/src/core/licqgui.cpp

Timestamp:

06/11/08 08:25:24 (6 months ago)

Author:

eugene

Message:

Applied the latest version of flynd's qt4-gui patch.

Files:

• branches/qt4-gui_group/src/core/licqgui.cpp (modified) (1 diff)

branches/qt4-gui_group/src/core/licqgui.cpp

@@ -754 +754 @@
       if (u == NULL)
         return true;
-      GroupList* g = gUserManager.LockGroupList(LOCK_R);
+      LicqGroup* g = gUserManager.FetchGroup(group, LOCK_R);
+      if (g == NULL)
+      {
+        gUserManager.DropUser(u);
+        return true;
+      }
       QString warning(tr("Are you sure you want to remove\n%1 (%2)\nfrom the '%3' group?")
           .arg(QString::fromUtf8(u->GetAlias()))
-          .arg(u->IdString()).arg(QString::fromLocal8Bit((*g)[group - 1])));
-      gUserManager.UnlockGroupList();
+          .arg(u->IdString()).arg(QString::fromLocal8Bit(g->name().c_str())));
+      gUserManager.DropGroup(g);
       gUserManager.DropUser(u);
       if (QueryYesNo(parent, warning))
       {
         gUserManager.RemoveUserFromGroup(id.toLatin1(), ppid, group);
-
-        // The daemon does not send an update when group membership changes
-        // so tell the contactList it needs to update
-        myContactList->updateUser(id, ppid);
         return true;
       }