Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-08-03 09:57:19 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-08-03 09:57:19 (GMT) |
| commit | 83791d091430a0b2fa534c104823f91a7587d64e (patch) | |
| tree | 4759ed491ee2d936c21328e73a873876cd2f19b6 | |
| parent | 9af232bad7ba867e8d29346f9d6730422178adcd (diff) | |
| download | swift-83791d091430a0b2fa534c104823f91a7587d64e.zip swift-83791d091430a0b2fa534c104823f91a7587d64e.tar.bz2 | |
Slimber: Remove debug output.
| -rw-r--r-- | Slimber/MainController.cpp | 6 | ||||
| -rw-r--r-- | Slimber/Server.cpp | 8 | ||||
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h | 2 | ||||
| -rw-r--r-- | Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/Slimber/MainController.cpp b/Slimber/MainController.cpp index 9cd8c4d..baf032c 100644 --- a/Slimber/MainController.cpp +++ b/Slimber/MainController.cpp @@ -80,7 +80,11 @@ void MainController::handleSelfConnected(bool b) { void MainController::handleServicesChanged() { std::vector<String> names; foreach(const LinkLocalService& service, linkLocalServiceBrowser->getServices()) { - names.push_back(service.getDescription()); + String description = service.getDescription(); + if (description != service.getName()) { + description += " (" + service.getName() + ")"; + } + names.push_back(description); } menuletController->setUserNames(names); } diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp index a944ab9..e07fb41 100644 --- a/Slimber/Server.cpp +++ b/Slimber/Server.cpp @@ -146,8 +146,8 @@ void Server::handleNewClientConnection(boost::shared_ptr<Connection> connection) serverFromClientSession->onSessionFinished.connect( boost::bind(&Server::handleSessionFinished, this, serverFromClientSession)); - tracers.push_back(boost::shared_ptr<SessionTracer>( - new SessionTracer(serverFromClientSession))); + //tracers.push_back(boost::shared_ptr<SessionTracer>( + // new SessionTracer(serverFromClientSession))); serverFromClientSession->startSession(); } @@ -275,7 +275,7 @@ void Server::handleNewLinkLocalConnection(boost::shared_ptr<Connection> connecti } void Server::handleLinkLocalSessionFinished(boost::shared_ptr<Session> session) { - std::cout << "Link local session from " << session->getRemoteJID() << " ended" << std::endl; + //std::cout << "Link local session from " << session->getRemoteJID() << " ended" << std::endl; linkLocalSessions.erase( std::remove(linkLocalSessions.begin(), linkLocalSessions.end(), session), linkLocalSessions.end()); @@ -316,7 +316,7 @@ void Server::registerLinkLocalSession(boost::shared_ptr<Session> session) { session->onElementReceived.connect( boost::bind(&Server::handleLinkLocalElementReceived, this, _1, session)); linkLocalSessions.push_back(session); - tracers.push_back(boost::shared_ptr<SessionTracer>(new SessionTracer(session))); + //tracers.push_back(boost::shared_ptr<SessionTracer>(new SessionTracer(session))); session->startSession(); } diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h index c605175..2dec2fb 100644 --- a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h @@ -41,7 +41,7 @@ namespace Swift { MainEventLoop::postEvent(boost::bind(boost::ref(onError)), shared_from_this()); } else { - std::cout << "Discovered service: name:" << name << " domain:" << domain << " type: " << type << std::endl; + //std::cout << "Discovered service: name:" << name << " domain:" << domain << " type: " << type << std::endl; DNSSDServiceID service(name, domain, type, interfaceIndex); if (flags & kDNSServiceFlagsAdd) { MainEventLoop::postEvent(boost::bind(boost::ref(onServiceAdded), service), shared_from_this()); diff --git a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h index 886b87b..1c38179 100644 --- a/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h +++ b/Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h @@ -45,7 +45,7 @@ namespace Swift { MainEventLoop::postEvent(boost::bind(boost::ref(onServiceResolved), boost::optional<Result>()), shared_from_this()); } else { - std::cout << "Service resolved: name:" << fullName << " host:" << host << " port:" << port << std::endl; + //std::cout << "Service resolved: name:" << fullName << " host:" << host << " port:" << port << std::endl; MainEventLoop::postEvent( boost::bind( boost::ref(onServiceResolved), |