Swiftdiff options
| -rw-r--r-- | Swift/QtUI/QtChatWindow.cpp | 2 | ||||
| -rw-r--r-- | Swift/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp index 125a5e2..dc89c21 100644 --- a/Swift/QtUI/QtChatWindow.cpp +++ b/Swift/QtUI/QtChatWindow.cpp @@ -488,19 +488,19 @@ void QtChatWindow::setAckState(std::string const& id, ChatWindow::AckState state } void QtChatWindow::setMessageReceiptState(const std::string& id, ChatWindow::ReceiptState state) { QString xml; switch (state) { case ChatWindow::ReceiptReceived: xml = "<img src='qrc:/icons/check.png' title='" + tr("The receipt for this message has been received.") + "'/>"; break; case ChatWindow::ReceiptRequested: - xml = "<img src='qrc:/icons/warn.png' title='" + tr("The receipt for this message has not yet been received. The receipient(s) might not have received this message.") + "'/>"; + xml = "<img src='qrc:/icons/warn.png' title='" + tr("The receipt for this message has not yet been received. The recipient(s) might not have received this message.") + "'/>"; break; } messageLog_->setReceiptXML(P2QSTRING(id), xml); } int QtChatWindow::getCount() { return unreadCount_; } diff --git a/Swift/SConscript b/Swift/SConscript index 49aa985..b66058b 100644 --- a/Swift/SConscript +++ b/Swift/SConscript @@ -5,12 +5,12 @@ Import("env") SConscript("Controllers/SConscript") if env["SCONS_STAGE"] == "build" : if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) and not env.get("HAVE_SCHANNEL", 0) : print "Error: Swift requires OpenSSL support, and OpenSSL was not found." if "Swift" in env["PROJECTS"] : env["PROJECTS"].remove("Swift") elif not GetOption("help") and not env.get("HAVE_QT", 0) : print "Error: Swift requires Qt. Not building Swift." -# env["PROJECTS"].remove("Swift") + env["PROJECTS"].remove("Swift") elif env["target"] == "native": SConscript("QtUI/SConscript") |