1 files changed, 5 insertions, 7 deletions
diff --git a/src/Server/ConnectionManager.cpp b/src/Server/ConnectionManager.cpp
index 99f5680..6ef918a 100644
--- a/src/Server/ConnectionManager.cpp
+++ b/src/Server/ConnectionManager.cpp
@@ -41,8 +41,6 @@
 #include <unistd.h>
 #include <algorithm>
 
-#include <sigc++/bind.h>
-
 namespace Mad {
 namespace Server {
 
@@ -54,7 +52,7 @@ bool ConnectionManager::Connection::send(const Net::Packet &packet) {
 
 ConnectionManager::Connection::Connection(Net::ServerConnection *connection0)
 : connection(connection0), type(connection0->isDaemonConnection() ? DAEMON : CLIENT), hostInfo(0) {
-  connection->signalReceive().connect(sigc::mem_fun(this, &Connection::receive));
+  connection->signalReceive().connect(boost::bind(&Connection::receive, this, _1));
 }
 
 ConnectionManager::Connection::~Connection() {
@@ -90,7 +88,7 @@ void ConnectionManager::updateState(Common::HostInfo *hostInfo, Common::HostInfo
 
   for(std::set<Connection*>::iterator con = connections.begin(); con != connections.end(); ++con) {
     if((*con)->getConnectionType() == Connection::CLIENT)
-      Common::RequestManager::get()->sendRequest<Requests::DaemonStateUpdateRequest>(*con, Common::Request::slot_type(), hostInfo->getName(), state);
+      Common::RequestManager::get()->sendRequest<Requests::DaemonStateUpdateRequest>(*con, boost::bind(&ConnectionManager::updateStateFinished, this, _1), hostInfo->getName(), state);
   }
 }
 
@@ -150,7 +148,7 @@ void ConnectionManager::configFinished() {
   if(listenerAddresses.empty()) {
     try {
       Net::Listener *listener = new Net::Listener(x509CertFile, x509KeyFile);
-      listener->signalNewConnection().connect(sigc::mem_fun(this, &ConnectionManager::newConnectionHandler));
+      listener->signalNewConnection().connect(boost::bind(&ConnectionManager::newConnectionHandler, this, _1));
       listeners.push_back(listener);
     }
     catch(Net::Exception &e) {
@@ -161,7 +159,7 @@ void ConnectionManager::configFinished() {
     for(std::vector<Net::IPAddress>::const_iterator address = listenerAddresses.begin(); address != listenerAddresses.end(); ++address) {
       try {
         Net::Listener *listener = new Net::Listener(x509CertFile, x509KeyFile, *address);
-        listener->signalNewConnection().connect(sigc::mem_fun(this, &ConnectionManager::newConnectionHandler));
+        listener->signalNewConnection().connect(boost::bind(&ConnectionManager::newConnectionHandler, this, _1));
         listeners.push_back(listener);
       }
       catch(Net::Exception &e) {
@@ -173,7 +171,7 @@ void ConnectionManager::configFinished() {
 
 void ConnectionManager::newConnectionHandler(Net::ServerConnection *con) {
   Connection *connection = new Connection(con);
-  con->signalDisconnected().connect(sigc::bind(sigc::mem_fun(this, &ConnectionManager::disconnectHandler), connection));
+  con->signalDisconnected().connect(boost::bind(&ConnectionManager::disconnectHandler, this, connection));
   connections.insert(connection);
 
   Common::RequestManager::get()->registerConnection(connection);