3 files changed, 4 insertions, 3 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h
index fd0e9d0..d3c9488 100644
--- a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourRegisterQuery.h
@@ -35,19 +35,19 @@ namespace Swift {
 				}
 			}
 
 			void unregisterService() {
 				finish();
 			}
 
 			void updateServiceInfo(const ByteArray& txtRecord) {
 				boost::lock_guard<boost::mutex> lock(sdRefMutex);
-				DNSServiceUpdateRecord(sdRef, NULL, NULL, txtRecord.size(), vecptr(txtRecord), 0);
+				DNSServiceUpdateRecord(sdRef, NULL, 0, txtRecord.size(), vecptr(txtRecord), 0);
 			}
 
 		private:
 			static void handleServiceRegisteredStatic(DNSServiceRef, DNSServiceFlags, DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain, void *context) {
 				static_cast<BonjourRegisterQuery*>(context)->handleServiceRegistered(errorCode, name, regtype, domain);
 			}
 
 			void handleServiceRegistered(DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain) {
 				if (errorCode != kDNSServiceErr_NoError) {
diff --git a/Swiften/QA/TLSTest/CertificateTest.cpp b/Swiften/QA/TLSTest/CertificateTest.cpp
index 67ca064..6932881 100644
--- a/Swiften/QA/TLSTest/CertificateTest.cpp
+++ b/Swiften/QA/TLSTest/CertificateTest.cpp
@@ -1,22 +1,23 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swiften/Base/ByteArray.h>
 
+#include <QA/Checker/IO.h>
+
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <boost/bind.hpp>
 
-#include <QA/Checker/IO.h>
 #include <Swiften/TLS/CertificateFactory.h>
 #include "SwifTools/Application/PlatformApplicationPathProvider.h"
 
 using namespace Swift;
 
 template<typename CERTIFICATE_FACTORY>
 class CertificateTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(CertificateTest);
 		CPPUNIT_TEST(testConstructFromDER);
diff --git a/Swiften/Session/Session.cpp b/Swiften/Session/Session.cpp
index 0eef997..acc73f1 100644
--- a/Swiften/Session/Session.cpp
+++ b/Swiften/Session/Session.cpp
@@ -44,19 +44,19 @@ void Session::finishSession() {
 		return;
 	}
 	finishing = true;
 	if (xmppLayer) {
 		xmppLayer->writeFooter();
 	}
 	connection->disconnect();
 }
 
-void Session::finishSession(const SessionError& error) {
+void Session::finishSession(const SessionError& /*error*/) {
 	if (finishing) {
 		return;
 	}
 	finishing = true;
 	if (xmppLayer) {
 		xmppLayer->writeFooter();
 	}
 	connection->disconnect();
 }