Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-27 19:06:56 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-27 19:07:55 (GMT) |
| commit | 6810a2896f27e7ee07aee847f5e8dbccd1f6ec89 (patch) | |
| tree | f7ea87f030e57cb4494a4f897506fb18fc3d2241 /Swiften/Examples/SendFile | |
| parent | a7da393cfc807048d320ddba8a1c7d24ef23a46e (diff) | |
| download | swift-contrib-6810a2896f27e7ee07aee847f5e8dbccd1f6ec89.zip swift-contrib-6810a2896f27e7ee07aee847f5e8dbccd1f6ec89.tar.bz2 | |
Remove MainEventLoop singleton.
The event loop now needs to be explicitly passed to clients
using it.
Diffstat (limited to 'Swiften/Examples/SendFile')
| -rw-r--r-- | Swiften/Examples/SendFile/SendFile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Examples/SendFile/SendFile.cpp b/Swiften/Examples/SendFile/SendFile.cpp index da0b2fe..6f72480 100644 --- a/Swiften/Examples/SendFile/SendFile.cpp +++ b/Swiften/Examples/SendFile/SendFile.cpp @@ -9,7 +9,7 @@ #include "Swiften/Client/Client.h" #include "Swiften/Network/BoostTimer.h" -#include "Swiften/EventLoop/MainEventLoop.h" +#include "Swiften/EventLoop/EventLoop.h" #include "Swiften/Client/ClientXMLTracer.h" #include "Swiften/EventLoop/SimpleEventLoop.h" #include "Swiften/Network/MainBoostIOServiceThread.h" @@ -27,10 +27,10 @@ int exitCode = 2; class FileSender { public: FileSender(const JID& jid, const String& password, const JID& recipient, const boost::filesystem::path& file, int port) : jid(jid), password(password), recipient(recipient), file(file), transfer(NULL) { - connectionServer = BoostConnectionServer::create(port, &MainBoostIOServiceThread::getInstance().getIOService()); + connectionServer = BoostConnectionServer::create(port, &MainBoostIOServiceThread::getInstance().getIOService(), &eventLoop); socksBytestreamServer = new SOCKS5BytestreamServer(connectionServer); - client = new Swift::Client(jid, password); + client = new Swift::Client(&eventLoop, jid, password); client->onConnected.connect(boost::bind(&FileSender::handleConnected, this)); client->onError.connect(boost::bind(&FileSender::handleError, this, _1)); //tracer = new ClientXMLTracer(client); |