Changeset 5740

Timestamp:

10/31/07 18:57:49 (13 months ago)

Author:

eugene

Message:

Revised viewInfo() and addUser() of search dialog.
This fixes #1575.

Files:

• branches/qt-gui_qt4/src/dialogs/searchuserdlg.cpp (modified) (2 diffs)

branches/qt-gui_qt4/src/dialogs/searchuserdlg.cpp

@@ -489 +489 @@
   foreach (QTreeWidgetItem* current, foundView->selectedItems())
   {
-    QString szId = QString("%1").arg(current->data(0, Qt::UserRole).toUInt());
-    ICQUser* u = gUserManager.FetchUser(szId.toLatin1(), LICQ_PPID, LOCK_R);
-    if (u == NULL)
+    QString szId = current->data(0, Qt::UserRole).toString();
+
+    if (!gUserManager.IsOnList(szId.toLatin1(), LICQ_PPID))
       server->AddUserToList(szId.toLatin1(), LICQ_PPID, false, true);
-    else
-      gUserManager.DropUser(u);
 
     mainwin->callInfoTab(mnuUserGeneral, szId, LICQ_PPID, false, true);
-    break;
   }
 }
@@ -505 +502 @@
   foreach (QTreeWidgetItem* current, foundView->selectedItems())
   {
-    unsigned long uin = current->data(0, Qt::UserRole).toUInt();
-    ICQUser* user = gUserManager.FetchUser(uin, LOCK_N);
-
-    if (user != NULL)
-    {
-      gUserManager.DropUser(user);
-      continue;
-    }
-
-    server->AddUserToList(uin);
-
-    if (qcbAlertUser->isChecked()) // alert the user they were added
+    unsigned long uin = current->data(0, Qt::UserRole).toString().toULong();
+
+    if (server->AddUserToList(uin) &&   // try to add a user
+        qcbAlertUser->isChecked())      // alert the user they were added
       server->icqAlertUser(uin);
   }
+
   foundView->clearSelection();
 }