fixed a bug with where nicks where not shown in the right category

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 227382b..4c82418 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -191,7 +191,6 @@ void BufferItem::part(IrcUser *ircUser) {
 
 void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
   UserCategoryItem *categoryItem = 0;
 
 void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
   UserCategoryItem *categoryItem = 0;

-  IrcUserItem *userItem;

   for(int i = 0; i < childCount(); i++) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
     categoryItem->removeChildById((quint64)ircUser);
   for(int i = 0; i < childCount(); i++) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
     categoryItem->removeChildById((quint64)ircUser);


@@ -202,10 +201,10 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
 
 void BufferItem::userModeChanged(IrcUser *ircUser) {
   Q_ASSERT(_ircChannel);
 
 void BufferItem::userModeChanged(IrcUser *ircUser) {
   Q_ASSERT(_ircChannel);

-    
+

   UserCategoryItem *categoryItem;
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
   UserCategoryItem *categoryItem;
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));

-  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))))
+  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))

     return; // already in the right category;
   
   removeUserFromCategory(ircUser);
     return; // already in the right category;
   
   removeUserFromCategory(ircUser);

diff --git a/version.inc b/version.inc
index 4b1435d..70f85d4 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-01-21";
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-01-21";

-  quasselBuild = 368;
+  quasselBuild = 370;

 
   //! Minimum client build number the core needs
   clientBuildNeeded = 358;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 358;