1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Network/Connector.cpp b/Swiften/Network/Connector.cpp
index a0155cf..a58efbc 100644
--- a/Swiften/Network/Connector.cpp
+++ b/Swiften/Network/Connector.cpp
@@ -11,34 +11,34 @@
 
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/DomainNameResolver.h>
 #include <Swiften/Network/DomainNameAddressQuery.h>
 #include <Swiften/Network/TimerFactory.h>
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
 
-Connector::Connector(const std::string& hostname, int port, bool doServiceLookups, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory) : hostname(hostname), port(port), doServiceLookups(doServiceLookups), resolver(resolver), connectionFactory(connectionFactory), timerFactory(timerFactory), timeoutMilliseconds(0), queriedAllServices(true), foundSomeDNS(false) {
+Connector::Connector(const std::string& hostname, int port, const boost::optional<std::string>& serviceLookupPrefix, DomainNameResolver* resolver, ConnectionFactory* connectionFactory, TimerFactory* timerFactory) : hostname(hostname), port(port), serviceLookupPrefix(serviceLookupPrefix), resolver(resolver), connectionFactory(connectionFactory), timerFactory(timerFactory), timeoutMilliseconds(0), queriedAllServices(true), foundSomeDNS(false) {
 }
 
 void Connector::setTimeoutMilliseconds(int milliseconds) {
 	timeoutMilliseconds = milliseconds;
 }
 
 void Connector::start() {
 	SWIFT_LOG(debug) << "Starting connector for " << hostname << std::endl;
 	//std::cout << "Connector::start()" << std::endl;
 	assert(!currentConnection);
 	assert(!serviceQuery);
 	assert(!timer);
 	queriedAllServices = false;
-	if (doServiceLookups) {
-		serviceQuery = resolver->createServiceQuery("_xmpp-client._tcp." + hostname);
+	if (serviceLookupPrefix) {
+		serviceQuery = resolver->createServiceQuery((*serviceLookupPrefix) + hostname);
 		serviceQuery->onResult.connect(boost::bind(&Connector::handleServiceQueryResult, shared_from_this(), _1));
 		if (timeoutMilliseconds > 0) {
 			timer = timerFactory->createTimer(timeoutMilliseconds);
 			timer->onTick.connect(boost::bind(&Connector::handleTimeout, shared_from_this()));
 		}
 		serviceQuery->run();
 	}
 	else {
 		queryAddress(hostname);