summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-27 16:53:25 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-27 16:53:25 (GMT)
commit736e98062eb2fed1a7b827cd852d2da76aa31189 (patch)
tree13527f0a839de6f1871594e3f83be31f88c332f8 /Swiften
parent6f30d20883b303f3bd536b2d8164963d61b9897a (diff)
parent4e25c7acd22515368575e2673d921832b99c32fa (diff)
downloadswift-contrib-736e98062eb2fed1a7b827cd852d2da76aa31189.zip
swift-contrib-736e98062eb2fed1a7b827cd852d2da76aa31189.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Keep shared_ptr of PlatformDomainNameServiceQuery in event loop. Renamed Swedish translation file to swift_sv.
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Network/PlatformDomainNameServiceQuery.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Network/PlatformDomainNameServiceQuery.cpp b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
index 24adde5..7d8074d 100644
--- a/Swiften/Network/PlatformDomainNameServiceQuery.cpp
+++ b/Swiften/Network/PlatformDomainNameServiceQuery.cpp
@@ -160,7 +160,7 @@ void PlatformDomainNameServiceQuery::runBlocking() {
std::sort(records.begin(), records.end(), ResultPriorityComparator());
//std::cout << "Sending out " << records.size() << " SRV results " << std::endl;
- eventLoop->postEvent(boost::bind(boost::ref(onResult), records));
+ eventLoop->postEvent(boost::bind(boost::ref(onResult), records), shared_from_this());
}
void PlatformDomainNameServiceQuery::emitError() {