Changeset 6288

Timestamp:

06/14/08 04:10:17 (3 months ago)

Author:

eugene

Message:

Merged r6265:6267 SVNROOT/branches/qt4-gui_group

Files:

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

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

@@ -96 +96 @@
   unsigned short group = myGroup->currentGroupId();
   bool notify = myNotify->isChecked();
+  bool added = false;
 
   if (!id.isEmpty())
@@ -105 +106 @@
       unsigned short currentNewGroup = gUserManager.NewUserGroup();
       gUserManager.SetNewUserGroup(group);
-      gLicqDaemon->AddUserToList(id, ppid, notify);
+      added = gLicqDaemon->AddUserToList(id, ppid);
       gUserManager.SetNewUserGroup(currentNewGroup);
     }
@@ -114 +115 @@
         u->SetPermanent();
         gUserManager.DropUser(u);
-        gUserManager.AddUserToGroup(id.toLatin1());
-        if (notify && ppid == LICQ_PPID)
-          gLicqDaemon->icqAlertUser(id.toULong());
+        gUserManager.AddUserToGroup(id, ppid, group);
+        added = true;
       }
       else
@@ -123 +123 @@
   }
 
+  if (added && notify && ppid == LICQ_PPID)
+    gLicqDaemon->icqAlertUser(id.toULong());
+
   close();
 }