1 files changed, 7 insertions, 10 deletions

diff --git a/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.cpp b/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.cpp
index b9dc030..ae12a8e 100644
--- a/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.cpp
+++ b/src/Core/RequestHandlers/DaemonFSInfoRequestHandler.cpp
@@ -27,7 +27,7 @@ namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-void DaemonFSInfoRequestHandler::handlePacket(Net::Connection *connection, uint16_t rid, const Common::XmlPacket &packet) {
+void DaemonFSInfoRequestHandler::handlePacket(const Common::XmlPacket &packet) {
   if(packet.getType() != "DaemonFSInfo") {
     Common::Logger::log(Common::Logger::ERROR, "Received an unexpected packet.");
 
@@ -35,7 +35,7 @@ void DaemonFSInfoRequestHandler::handlePacket(Net::Connection *connection, uint1
     ret.setType("Error");
     ret.add("ErrorCode", Common::Exception::UNEXPECTED_PACKET);
 
-    connection->send(ret.encode(rid));
+    sendPacket(ret);
 
     signalFinished().emit();
     return;
@@ -43,12 +43,10 @@ void DaemonFSInfoRequestHandler::handlePacket(Net::Connection *connection, uint1
 
   // TODO Require authentication
 
-  con = connection;
-  requestId = rid;
-
   try {
     Net::Connection *daemonCon = ConnectionManager::get()->getDaemonConnection(packet["daemon"]);
-    Common::RequestManager::get()->sendRequest(daemonCon, std::auto_ptr<Common::Request>(new Common::Requests::FSInfoRequest(sigc::mem_fun(this, &DaemonFSInfoRequestHandler::requestFinished))));
+    Common::RequestManager::get()->sendRequest<Common::Requests::FSInfoRequest>(daemonCon,
+        sigc::mem_fun(this, &DaemonFSInfoRequestHandler::requestFinished));
   }
   catch(Common::Exception &e) {
     Common::XmlPacket ret;
@@ -58,14 +56,13 @@ void DaemonFSInfoRequestHandler::handlePacket(Net::Connection *connection, uint1
     ret.add("SubSubCode", e.getSubSubCode());
     ret.add("Where", e.getWhere());
 
-    con->send(ret.encode(requestId));
+    sendPacket(ret);
   }
 }
 
 void DaemonFSInfoRequestHandler::requestFinished(const Common::Request &request) {
   try {
-    const Common::XmlPacket &packet = request.getResult();
-    con->send(packet.encode(requestId));
+    sendPacket(request.getResult());
   }
   catch(Common::Exception &e) {
     Common::XmlPacket ret;
@@ -75,7 +72,7 @@ void DaemonFSInfoRequestHandler::requestFinished(const Common::Request &request)
     ret.add("SubSubCode", e.getSubSubCode());
     ret.add("Where", e.getWhere());
 
-    con->send(ret.encode(requestId));
+    sendPacket(ret);
   }
 
   signalFinished().emit();