summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-02 14:07:00 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-02 14:07:40 (GMT)
commit66fd05d46a6ead4d780bdb4da1ede43058c272da (patch)
tree04dc651f7ae91fdf072454978a46cfc996948576 /Swiften/Network
parent8c60e86c8fc2cf60825c0ffbd882693dccf0b33c (diff)
downloadswift-contrib-66fd05d46a6ead4d780bdb4da1ede43058c272da.zip
swift-contrib-66fd05d46a6ead4d780bdb4da1ede43058c272da.tar.bz2
Slimber: Handle ConnectionServer disconnects more cleanly.
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/BoostConnectionServer.cpp4
-rw-r--r--Swiften/Network/BoostConnectionServer.h1
-rw-r--r--Swiften/Network/ConnectionServer.h2
3 files changed, 0 insertions, 7 deletions
diff --git a/Swiften/Network/BoostConnectionServer.cpp b/Swiften/Network/BoostConnectionServer.cpp
index 97c1316..4e83ad5 100644
--- a/Swiften/Network/BoostConnectionServer.cpp
+++ b/Swiften/Network/BoostConnectionServer.cpp
@@ -42,10 +42,6 @@ void BoostConnectionServer::stop(boost::optional<Error> e) {
MainEventLoop::postEvent(boost::bind(boost::ref(onStopped), e), shared_from_this());
}
-void BoostConnectionServer::cancelAllEvents() {
- MainEventLoop::removeEventsFromOwner(shared_from_this());
-}
-
void BoostConnectionServer::acceptNextConnection() {
boost::shared_ptr<BoostConnection> newConnection(new BoostConnection(&acceptor_->io_service()));
acceptor_->async_accept(newConnection->getSocket(),
diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h
index 13d87a5..d8e5eb4 100644
--- a/Swiften/Network/BoostConnectionServer.h
+++ b/Swiften/Network/BoostConnectionServer.h
@@ -20,7 +20,6 @@ namespace Swift {
void start();
void stop();
- virtual void cancelAllEvents();
boost::signal<void (boost::optional<Error>)> onStopped;
diff --git a/Swiften/Network/ConnectionServer.h b/Swiften/Network/ConnectionServer.h
index 9300092..539367d 100644
--- a/Swiften/Network/ConnectionServer.h
+++ b/Swiften/Network/ConnectionServer.h
@@ -10,8 +10,6 @@ namespace Swift {
public:
virtual ~ConnectionServer();
- virtual void cancelAllEvents() = 0;
-
boost::signal<void (boost::shared_ptr<Connection>)> onNewConnection;
};
}