Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-01-22 13:31:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-01-22 13:31:54 (GMT) |
| commit | 940cb5e744564ec15b805a9e5388e1fa5c60d703 (patch) | |
| tree | 9c5ed10128c5869c99dbeacc251234802ffbf53b /Swiften/Component | |
| parent | 7de0bdc001ab361b26dc50add7b48e49f87ac755 (diff) | |
| download | swift-940cb5e744564ec15b805a9e5388e1fa5c60d703.zip swift-940cb5e744564ec15b805a9e5388e1fa5c60d703.tar.bz2 | |
Renaming SessionStream::onError to SessionStream::onClosed.
Diffstat (limited to 'Swiften/Component')
| -rw-r--r-- | Swiften/Component/ComponentSession.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Component/UnitTest/ComponentSessionTest.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Component/ComponentSession.cpp b/Swiften/Component/ComponentSession.cpp index d15d51c..967e68d 100644 --- a/Swiften/Component/ComponentSession.cpp +++ b/Swiften/Component/ComponentSession.cpp @@ -24,7 +24,7 @@ ComponentSession::~ComponentSession() { void ComponentSession::start() { stream->onStreamStartReceived.connect(boost::bind(&ComponentSession::handleStreamStart, shared_from_this(), _1)); stream->onElementReceived.connect(boost::bind(&ComponentSession::handleElement, shared_from_this(), _1)); - stream->onError.connect(boost::bind(&ComponentSession::handleStreamError, shared_from_this(), _1)); + stream->onClosed.connect(boost::bind(&ComponentSession::handleStreamError, shared_from_this(), _1)); assert(state == Initial); state = WaitingForStreamStart; @@ -98,7 +98,7 @@ void ComponentSession::finishSession(boost::shared_ptr<Swift::Error> error) { stream->setWhitespacePingEnabled(false); stream->onStreamStartReceived.disconnect(boost::bind(&ComponentSession::handleStreamStart, shared_from_this(), _1)); stream->onElementReceived.disconnect(boost::bind(&ComponentSession::handleElement, shared_from_this(), _1)); - stream->onError.disconnect(boost::bind(&ComponentSession::handleStreamError, shared_from_this(), _1)); + stream->onClosed.disconnect(boost::bind(&ComponentSession::handleStreamError, shared_from_this(), _1)); if (stream->isAvailable()) { stream->writeFooter(); } diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp index ac24778..3ad52f9 100644 --- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp +++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp @@ -148,7 +148,7 @@ class ComponentSessionTest : public CppUnit::TestFixture { } void breakConnection() { - onError(boost::shared_ptr<SessionStream::Error>(new SessionStream::Error(SessionStream::Error::ConnectionReadError))); + onClosed(boost::shared_ptr<SessionStream::Error>(new SessionStream::Error(SessionStream::Error::ConnectionReadError))); } void sendStreamStart() { |