X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=784f3fc816bbfb2a0c7247bedfd7693280d98817;hp=227382b947a21b447e3c1efdfb62f555e9d24a1d;hb=2f11200e02c352180b1e7546ae1c88b08566275c;hpb=7df7429c009d2bea4c516e87f1ec4c956c722e09

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 227382b9..784f3fc8 100644
--- 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;
-  IrcUserItem *userItem;
   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);
-    
+
   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);
@@ -363,7 +362,7 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
 	  this, SLOT(setNick(QString)));
 }
 
-QString IrcUserItem::nickName() {
+QString IrcUserItem::nickName() const {
   return _ircUser->nick();
 }
 
@@ -375,6 +374,13 @@ quint64 IrcUserItem::id() const {
   return (quint64)_ircUser;
 }
 
+QVariant IrcUserItem::data(int column, int role) const {
+  if(role != Qt::ToolTipRole)
+    return PropertyMapItem::data(column, role);
+
+  return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
+}
+
 void IrcUserItem::setNick(QString newNick) {
   Q_UNUSED(newNick);
   emit dataChanged(0);