summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-05-06 06:23:01 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-05-06 06:23:01 (GMT)
commitcc333c83f57b98d634a0b5ba050de78be91c1903 (patch)
tree19a51ee077e9cc4229d69ec2174dc84580263c5d
parent01e8f4792591f744893ab7ff799200efc8ad299a (diff)
downloadswift-contrib-cc333c83f57b98d634a0b5ba050de78be91c1903.zip
swift-contrib-cc333c83f57b98d634a0b5ba050de78be91c1903.tar.bz2
Fixed Avahi compilation.
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h2
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp2
2 files changed, 2 insertions, 2 deletions
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) {