2 files changed, 12 insertions, 20 deletions
diff --git a/Slimber/CLI/Makefile.inc b/Slimber/CLI/Makefile.inc
index 601929c..974b835 100644
--- a/Slimber/CLI/Makefile.inc
+++ b/Slimber/CLI/Makefile.inc
@@ -7,10 +7,9 @@ SLIMBER_CLI_OBJECTS = \
 $(SLIMBER_CLI_TARGET): $(SWIFTEN_TARGET) $(SLIMBER_TARGET) $(SLIMBER_CLI_OBJECTS)
 	$(QUIET_LINK)$(CXX) -o $(SLIMBER_CLI_TARGET) $(SLIMBER_CLI_OBJECTS) $(LDFLAGS) $(SLIMBER_TARGET) $(SWIFTEN_TARGET) $(LIBS)
 
-TARGETS += $(SLIMBER_CLI_TARGET)
+#TARGETS += $(SLIMBER_CLI_TARGET)
 SLIMBER_TARGETS += $(SLIMBER_CLI_TARGET)
 CLEANFILES += \
-	$(SLIMBER_CLI_OBJECTS) \
 	$(SLIMBER_CLI_TARGET)
 DEPS += \
 	$(SLIMBER_CLI_SOURCES:.cpp=.dep) \
diff --git a/Slimber/CLI/main.cpp b/Slimber/CLI/main.cpp
index 40f41c8..b82ffcd 100644
--- a/Slimber/CLI/main.cpp
+++ b/Slimber/CLI/main.cpp
@@ -2,14 +2,12 @@
 #include <boost/bind.hpp>
 
 #include "Swiften/Base/Platform.h"
-#if defined(SWIFTEN_PLATFORM_MACOSX) || defined(SWIFTEN_PLATFORM_WINDOWS)
-#include "Swiften/LinkLocal/AppleDNSSDService.h"
-#else
-#include "Swiften/LinkLocal/AvahiDNSSDService.h"
-#endif
 #include "Slimber/Server.h"
 #include "Slimber/FileVCardCollection.h"
-#include "Swiften/LinkLocal/LinkLocalRoster.h"
+#include "Swiften/LinkLocal/LinkLocalServiceBrowser.h"
+#include "Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h"
+#include "Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h"
+#include "Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include "Swiften/Application/Platform/PlatformApplication.h"
 
@@ -17,21 +15,16 @@ using namespace Swift;
 
 int main() {
 	SimpleEventLoop eventLoop;
+	boost::shared_ptr<BonjourQuerier> querier(new BonjourQuerier());
+	querier->start();
+	LinkLocalServiceBrowser browser(querier);
+	browser.start();
 
-	boost::shared_ptr<DNSSDService> dnsSDService;
-#if defined(SWIFTEN_PLATFORM_MACOSX) || defined(SWIFTEN_PLATFORM_WINDOWS)
-	dnsSDService = boost::shared_ptr<AppleDNSSDService>(
-			new AppleDNSSDService());
-#else
-	dnsSDService = boost::shared_ptr<AvahiDNSSDService>(
-			new AvahiDNSSDService());
-#endif
-
-	boost::shared_ptr<LinkLocalRoster> linkLocalRoster = boost::shared_ptr<LinkLocalRoster>(new LinkLocalRoster(dnsSDService));
-
+/*
 	FileVCardCollection vCardCollection(PlatformApplication("Slimber").getSettingsDir());
-
 	Server server(5222, 5562, linkLocalRoster, dnsSDService, &vCardCollection);
+	*/
+	
 	eventLoop.run();
 	return 0;
 }