1 files changed, 7 insertions, 46 deletions
diff --git a/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h b/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h
index 163a5f6..38e796d 100644
--- a/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h
+++ b/Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h
@@ -6,11 +6,11 @@
 
 #pragma once
 
-#include <boost/bind.hpp>
+#include <avahi-client/lookup.h>
 
-#include "Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h"
-#include "Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h"
-#include "Swiften/EventLoop/EventLoop.h"
+#include <Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h>
+#include <Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h>
+#include <Swiften/EventLoop/EventLoop.h>
 
 namespace Swift {
 	class AvahiQuerier;
@@ -20,54 +20,15 @@ namespace Swift {
 			AvahiBrowseQuery(boost::shared_ptr<AvahiQuerier> q, EventLoop* eventLoop) : AvahiQuery(q, eventLoop), browser(NULL) {
 			}
 
-			void startBrowsing() {
-				std::cout << "Start browsing" << std::endl;
-				assert(!browser);
-				avahi_threaded_poll_lock(querier->getThreadedPoll());
-				browser = avahi_service_browser_new(querier->getClient(), AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_presence._tcp", NULL, static_cast<AvahiLookupFlags>(0), &handleServiceDiscoveredStatic, this);
-				if (!browser) {
-					std::cout << "Error" << std::endl;
-					eventLoop->postEvent(boost::bind(boost::ref(onError)), shared_from_this());
-				}
-				avahi_threaded_poll_unlock(querier->getThreadedPoll());
-			}
-
-			void stopBrowsing() {
-				std::cout << "Stop browsing" << std::endl;
-				avahi_threaded_poll_lock(querier->getThreadedPoll());
-				avahi_service_browser_free(browser);
-				browser = NULL;
-				avahi_threaded_poll_unlock(querier->getThreadedPoll());
-			}
+			void startBrowsing();
+			void stopBrowsing();
 
 		private:
 			static void handleServiceDiscoveredStatic(AvahiServiceBrowser *b, AvahiIfIndex interfaceIndex, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags flags, void* context) {
 				static_cast<AvahiBrowseQuery*>(context)->handleServiceDiscovered(b, interfaceIndex, protocol, event, name, type, domain, flags);
 			}
 
-			void handleServiceDiscovered(AvahiServiceBrowser *, AvahiIfIndex interfaceIndex, AvahiProtocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags) {
-				switch (event) {
-					case AVAHI_BROWSER_FAILURE:	
-						std::cout << "Service browse error" << std::endl;
-						eventLoop->postEvent(boost::bind(boost::ref(onError)), shared_from_this());
-						break;
-					case AVAHI_BROWSER_NEW: {
-						DNSSDServiceID service(name, domain, type, interfaceIndex);
-						std::cout << "Service discovered " << name << " " << domain << " " << type << " " << interfaceIndex << std::endl;
-						eventLoop->postEvent(boost::bind(boost::ref(onServiceAdded), service), shared_from_this());
-						break;
-					}
-					case AVAHI_BROWSER_REMOVE: {
-						std::cout << "Service went away " << name << " " << domain << " " << type << " " << interfaceIndex << std::endl;
-						DNSSDServiceID service(name, domain, type, interfaceIndex);
-						eventLoop->postEvent(boost::bind(boost::ref(onServiceRemoved), service), shared_from_this());
-						break;
-					}
-					case AVAHI_BROWSER_ALL_FOR_NOW:
-					case AVAHI_BROWSER_CACHE_EXHAUSTED:
-						break;
-				}
-			}
+			void handleServiceDiscovered(AvahiServiceBrowser *, AvahiIfIndex interfaceIndex, AvahiProtocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags);
 
 		private:
 			AvahiServiceBrowser* browser;