summaryrefslogtreecommitdiffstats
path: root/QA
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-09-11 13:46:08 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-09-11 14:02:39 (GMT)
commit1b47266d6b955fb533b4c272b4bcc58693078a1a (patch)
treedd52b86408a03308c84c33674989d2d75af58893 /QA
parent5e235d01612b2544fe02cc34816cd6e925ed564f (diff)
downloadswift-1b47266d6b955fb533b4c272b4bcc58693078a1a.zip
swift-1b47266d6b955fb533b4c272b4bcc58693078a1a.tar.bz2
Disable WhitespacePingLayer on disconnect + Timer refactoring.
Timer now no longer runs in its own thread, but in the main Boost IOService thread.
Diffstat (limited to 'QA')
-rw-r--r--QA/Swiften/ClientTest/ClientTest.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/QA/Swiften/ClientTest/ClientTest.cpp b/QA/Swiften/ClientTest/ClientTest.cpp
index b628a8d..412eb53 100644
--- a/QA/Swiften/ClientTest/ClientTest.cpp
+++ b/QA/Swiften/ClientTest/ClientTest.cpp
@@ -7,6 +7,8 @@
#include "Swiften/EventLoop/SimpleEventLoop.h"
#include "Swiften/Queries/Requests/GetRosterRequest.h"
#include "Swiften/Client/ClientXMLTracer.h"
+#include "Swiften/Network/BoostIOServiceThread.h"
+#include "Swiften/Network/MainBoostIOServiceThread.h"
using namespace Swift;
@@ -44,7 +46,7 @@ int main(int, char**) {
client->connect();
{
- boost::shared_ptr<Timer> timer(new Timer(10000));
+ boost::shared_ptr<Timer> timer(new Timer(10000, &MainBoostIOServiceThread::getInstance().getIOService()));
timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
timer->start();