Changeset 6279

Timestamp:

06/13/08 03:40:47 (4 months ago)

Author:

flynd

Message:

Use new user group handling function so we need less code here in the plugin.

Location:

trunk/qt4-gui/src

Files:

• core/groupmenu.cpp (modified) (1 diff)
• core/usermenu.cpp (modified) (3 diffs)
• views/userviewbase.cpp (modified) (1 diff)

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

@@ -175 +175 @@
     unsigned long ppid = userIndex.data(ContactListModel::PpidRole).toUInt();
 
-    // Update user object
-    ICQUser* u = gUserManager.FetchUser(id.toLatin1(), ppid, LOCK_W);
-    if (u == NULL)
-      continue;
-    u->SetInGroup(gtype, gid, true);
-    gUserManager.DropUser(u);
-
-    // Some special groups need special handling
-    if (groupId == ContactListModel::SystemGroupOffset + GROUP_VISIBLE_LIST)
-      gLicqDaemon->icqAddToVisibleList(id.toLatin1(), ppid);
-    if (groupId == ContactListModel::SystemGroupOffset + GROUP_INVISIBLE_LIST)
-      gLicqDaemon->icqAddToInvisibleList(id.toLatin1(), ppid);
-    if (groupId == ContactListModel::SystemGroupOffset + GROUP_IGNORE_LIST)
-      gLicqDaemon->icqAddToIgnoreList(id.toLatin1(), ppid);
+    gUserManager.SetUserInGroup(id.toLatin1(), ppid, gtype, gid, true,
+        gtype == GROUPS_SYSTEM);
 
     // Daemon doesn't notify us when group memberships change so notify model from here

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

@@ -537 +537 @@
 {
   unsigned int gid = action->data().toUInt();
-
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_W);
-
-  if (u == NULL)
-    return;
-
-  // Don't let the user to be deleted from local group
-  // if he is a member of the same server group
-  if (!action->isChecked() &&                             // delete
-      u->GetSID() &&                                      // server-side
-      gUserManager.GetGroupFromID(u->GetGSID()) == gid)   // same group
-  {
-    gUserManager.DropUser(u);
-    return;
-  }
-
-  u->SetInGroup(GROUPS_USER, gid, action->isChecked());
-
-  gUserManager.DropUser(u);
+  gUserManager.SetUserInGroup(myId.toLatin1(), myPpid, GROUPS_USER, gid,
+      action->isChecked(), false);
 
   // The daemon does not send an update when group membership changes
@@ -566 +549 @@
   unsigned int gid = action->data().toUInt();
 
-  ICQUser* u = NULL;
-  if (gid == GROUP_NEW_USERS || gid == GROUP_ONLINE_NOTIFY || gid == GROUP_IGNORE_LIST)
-  {
-    u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_W);
+  if (gid == GROUP_IGNORE_LIST && !action->isChecked())
+  {
+    ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
     if (u == NULL)
       return;
-  }
-
-  switch (gid)
-  {
-    case GROUP_NEW_USERS:
-      u->SetNewUser(action->isChecked());
-      break;
-
-    case GROUP_ONLINE_NOTIFY:
-      u->SetOnlineNotify(action->isChecked());
-      break;
-
-    case GROUP_VISIBLE_LIST:
-      gLicqDaemon->ProtoToggleVisibleList(myId.toLatin1(), myPpid);
-      break;
-
-    case GROUP_INVISIBLE_LIST:
-      gLicqDaemon->ProtoToggleInvisibleList(myId.toLatin1(), myPpid);
-      break;
-
-    case GROUP_IGNORE_LIST:
-      if (!action->isChecked() ||
-          QueryYesNo(this, tr("Do you really want to add\n%1 (%2)\nto your ignore list?")
-            .arg(QString::fromUtf8(u->GetAlias())).arg(myId)))
-      {
-        u->SetIgnoreList(action->isChecked());
-        gUserManager.DropUser(u);
-        u = NULL;
-        gLicqDaemon->icqToggleIgnoreList(myId.toLatin1(), myPpid); // network only
-      }
-      break;
-  }
-
-  if (u != NULL)
+
+    QString alias = QString::fromUtf8(u->GetAlias());
     gUserManager.DropUser(u);
+
+    if(!QueryYesNo(this, tr("Do you really want to add\n%1 (%2)\nto your ignore list?")
+        .arg(alias).arg(myId)))
+      return;
+  }
+
+  gUserManager.SetUserInGroup(myId.toLatin1(), myPpid, GROUPS_SYSTEM, gid,
+      action->isChecked(), true);
 
   // The daemon does not send an update when group membership changes
@@ -615 +573 @@
 void UserMenu::setServerGroup(QAction* action)
 {
-  gUserManager.AddUserToGroup(myId.toLatin1(), myPpid, action->data().toUInt());
+  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

trunk/qt4-gui/src/views/userviewbase.cpp

@@ -286 +286 @@
         if (!dropId.isEmpty())
         {
-          gUserManager.AddUserToGroup(dropId.toLatin1(), dropPpid, gid);
+          gUserManager.SetUserInGroup(dropId.toLatin1(), dropPpid, GROUPS_USER, gid, true);
           myContactList->updateUser(dropId.toLatin1(), dropPpid);
         }