Changeset 6304

Timestamp:

06/14/08 12:23:19 (4 months ago)

Author:

eugene

Message:

Replaced one workaround with an uglier one.
Waiting for emostar to export the needed daemon API method.

Files:

• trunk/qt4-gui/src/dialogs/adduserdlg.cpp (modified) (3 diffs)

trunk/qt4-gui/src/dialogs/adduserdlg.cpp

@@ -58 +58 @@
   QLabel* lblGroup = new QLabel(tr("&Group:"));
   myGroup = new GroupComboBox();
-  myGroup->setCurrentGroupId(gUserManager.NewUserGroup());
   lblGroup->setBuddy(myGroup);
 
@@ -103 +102 @@
 
     if (u == NULL)
-    {
-      unsigned short currentNewGroup = gUserManager.NewUserGroup();
-      gUserManager.SetNewUserGroup(group);
       added = gLicqDaemon->AddUserToList(id, ppid);
-      gUserManager.SetNewUserGroup(currentNewGroup);
-    }
     else
     {
@@ -114 +108 @@
       {
         u->SetPermanent();
-        gUserManager.DropUser(u);
-        gUserManager.AddUserToGroup(id, ppid, group);
         added = true;
       }
-      else
-        gUserManager.DropUser(u);
+      gUserManager.DropUser(u);
     }
   }
 
-  if (added && notify && ppid == LICQ_PPID)
-    gLicqDaemon->icqAlertUser(id.toULong());
+  if (added)
+  {
+    gUserManager.SetUserInGroup(id, ppid, GROUPS_USER, group, true, true);
+    if (notify && ppid == LICQ_PPID)
+      gLicqDaemon->icqAlertUser(id.toULong());
+  }
 
   close();