summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-05-25 13:39:11 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-05-25 13:39:11 (GMT)
commitedfa5624164f0369180d90d13c6a88bbc31c6248 (patch)
tree46f446e0c8b0f1b8403dab041ce729a84aa27282 /Swift
parent11b38f8479650b7f66a818d4cd6665e8445c82a1 (diff)
downloadswift-edfa5624164f0369180d90d13c6a88bbc31c6248.zip
swift-edfa5624164f0369180d90d13c6a88bbc31c6248.tar.bz2
Don't show a blank line for empty status in tooltips.
Resolves: #384
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/Roster/RosterModel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index 00a032d..12cedda 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -120,7 +120,7 @@ QColor RosterModel::getBackgroundColor(RosterItem* item) const {
}
QString RosterModel::getToolTip(RosterItem* item) const {
- return dynamic_cast<ContactRosterItem*>(item) ? P2QSTRING(item->getDisplayName()) + "\n" + getStatusText(item) : P2QSTRING(item->getDisplayName());
+ return dynamic_cast<ContactRosterItem*>(item) && !getStatusText(item).isEmpty() ? P2QSTRING(item->getDisplayName()) + "\n" + getStatusText(item) : P2QSTRING(item->getDisplayName());
}
QIcon RosterModel::getAvatar(RosterItem* item) const {