Changeset 6368

Timestamp:

07/01/08 04:26:06 (5 months ago)

Author:

flynd

Message:

Daemon users no longer return true when checking membership in user group 0 so we need to handle All users group separately.

Files:

• trunk/qt-gui/src/mainwin.cpp (modified) (4 diffs)

trunk/qt-gui/src/mainwin.cpp

@@ -1515 +1515 @@
         }
       }
-      else if (u->GetInGroup(m_nGroupType, m_nCurrentGroup))
+      else if ((m_nGroupType == GROUPS_USER && m_nCurrentGroup == 0) ||
+          u->GetInGroup(m_nGroupType, m_nCurrentGroup))
       {
         // Update this user if they are in the current group
@@ -1660 +1661 @@
       {
 
-        if (u->GetInGroup(m_nGroupType, m_nCurrentGroup) && show_user(u) )
-          (void) new CUserViewItem(u, userView);
+        if ((m_nGroupType == GROUPS_USER && m_nCurrentGroup == 0) ||
+            u->GetInGroup(m_nGroupType, m_nCurrentGroup))
+          if (show_user(u))
+            (void) new CUserViewItem(u, userView);
       }
       // as we intercept the user's addition, we set it our default codec
@@ -1820 +1823 @@
   FOR_EACH_USER_START(LOCK_R)
   {
-    // Only show users on the current group and not on the ignore list
-    if (!doGroupView && (!pUser->GetInGroup(m_nGroupType, m_nCurrentGroup) ||
-      (pUser->IgnoreList() && m_nGroupType != GROUPS_SYSTEM && m_nCurrentGroup != GROUP_IGNORE_LIST) ))
+    if (pUser->IgnoreList() && m_nGroupType != GROUPS_SYSTEM && m_nCurrentGroup != GROUP_IGNORE_LIST)
       FOR_EACH_USER_CONTINUE
 
@@ -1839 +1840 @@
     }
     else
-      // Add the user to the list
-      (void) new CUserViewItem(pUser, userView);
+    {
+      if ((m_nGroupType == GROUPS_USER && m_nCurrentGroup == 0) ||
+          pUser->GetInGroup(m_nGroupType, m_nCurrentGroup))
+        // Add the user to the list
+        (void) new CUserViewItem(pUser, userView);
+    }
   }
   FOR_EACH_USER_END