From a23fb5087b321cddd5b2eb97d8381b3ed742a874 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Thu, 12 Jan 2012 09:11:12 +0000
Subject: Don't crash with multiline status message and Qt-4.8.0

It looks as if 4.8 crashes if you ask it to elide text that has newlines in it. This change changes the rendering to show all lines as one. This slightly changes roster rendering for people with multiline messages.

Resolves: #1056

diff --git a/Swift/QtUI/Roster/DelegateCommons.cpp b/Swift/QtUI/Roster/DelegateCommons.cpp
index 0dc8a52..a575cb0 100644
--- a/Swift/QtUI/Roster/DelegateCommons.cpp
+++ b/Swift/QtUI/Roster/DelegateCommons.cpp
@@ -14,7 +14,7 @@ namespace Swift {
 
 void DelegateCommons::drawElidedText(QPainter* painter, const QRect& region, const QString& text, int flags) {
 	QString adjustedText(painter->fontMetrics().elidedText(text, Qt::ElideRight, region.width(), Qt::TextShowMnemonic));
-	painter->drawText(region, flags, adjustedText);
+	painter->drawText(region, flags, adjustedText.simplified());
 }
 
 void DelegateCommons::paintContact(QPainter* painter, const QStyleOptionViewItem& option, const QColor& nameColor, const QString& avatarPath, const QIcon& presenceIcon, const QString& name, const QString& statusText, int unreadCount, bool compact) const {
-- 
cgit v0.10.2-6-g49f6