From cc333c83f57b98d634a0b5ba050de78be91c1903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Fri, 6 May 2011 08:23:01 +0200
Subject: Fixed Avahi compilation.


diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h
index e76334d..6ddd23d 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h
@@ -16,9 +16,9 @@
 #include <avahi-common/error.h>
 
 #include <Swiften/LinkLocal/DNSSD/DNSSDQuerier.h>
+#include <Swiften/Base/ByteArray.h>
 
 namespace Swift {
-	class ByteArray;
 	class EventLoop;
 
 	class AvahiQuerier : 
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp b/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp
index 7975e7b..8a7ed3b 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp
@@ -47,7 +47,7 @@ void AvahiRegisterQuery::updateServiceInfo(const ByteArray& txtRecord) {
 
 void AvahiRegisterQuery::doRegisterService() {
 	AvahiStringList* txtList;
-	avahi_string_list_parse(txtRecord.getData(), txtRecord.getSize(), &txtList);
+	avahi_string_list_parse(vecptr(txtRecord), txtRecord.size(), &txtList);
 
 	int result = avahi_entry_group_add_service_strlst(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, static_cast<AvahiPublishFlags>(0), name.c_str(), "_presence._tcp", NULL, NULL, port, txtList);
 	if (result < 0) {
-- 
cgit v0.10.2-6-g49f6