Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-02-14 09:26:13 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-02-14 09:26:13 (GMT) |
| commit | aae3defeecd5a000db33c973f9241d8b9db12c0c (patch) | |
| tree | eda2a5a2d45f5a70c2f5d64272ecf2a73f008a15 /Swift | |
| parent | 67087f4374ddca69c4d3d9303e85795f060f50a2 (diff) | |
| download | swift-aae3defeecd5a000db33c973f9241d8b9db12c0c.zip swift-aae3defeecd5a000db33c973f9241d8b9db12c0c.tar.bz2 | |
Fix rendering of mediated invites
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtChatWindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp index ed8e632..4cf606c 100644 --- a/Swift/QtUI/QtChatWindow.cpp +++ b/Swift/QtUI/QtChatWindow.cpp @@ -805,7 +805,10 @@ void QtChatWindow::addMUCInvitation(const JID& jid, const std::string& reason, c reasonString = QString("\"%1\"").arg(P2QSTRING(reason)); } if (!direct) { - reasonString += QString("(%1 may not have really sent this invitation)").arg(P2QSTRING(jid.toString())); + if (!reasonString.isEmpty()) { + reasonString += " "; + } + reasonString += QString(" (%1 may not have really sent this invitation)").arg(contact_); } msgBox.setInformativeText(QString("Accept invitation from %1 to enter %2?\n%3").arg(contact_).arg(P2QSTRING(jid.toString())).arg(reasonString)); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); |