5 files changed, 9 insertions, 9 deletions
diff --git a/src/Common/Request/CoreStatusRequest.h b/src/Common/Request/CoreStatusRequest.h
index 97f8318..cd28cc2 100644
--- a/src/Common/Request/CoreStatusRequest.h
+++ b/src/Common/Request/CoreStatusRequest.h
@@ -23,7 +23,7 @@
 #include "Request.h"
 #include "../RequestManager.h"
 #include <Net/Connection.h>
-#include <Net/Packet.h>
+#include <Net/Packets/CoreStatusPacket.h>
 
 #include <sigc++/signal.h>
 
@@ -33,12 +33,12 @@ namespace Request {
 
 class CoreStatusRequest: public Request {
   private:
-    sigc::signal<void> finished;
+    sigc::signal<void,const Net::Packets::CoreStatusPacket&> finished;
 
     CoreStatusRequest() {}
 
   public:
-    static bool send(Net::Connection *connection, RequestManager &requestManager, const sigc::slot<void> &callback) {
+    static bool send(Net::Connection *connection, RequestManager &requestManager, const sigc::slot<void,const Net::Packets::CoreStatusPacket&> &callback) {
       CoreStatusRequest *request = new CoreStatusRequest();
 
       request->finished.connect(callback);
@@ -50,7 +50,7 @@ class CoreStatusRequest: public Request {
       return false;
     }
 
-    virtual bool sendRequest(Net::Connection *connection, unsigned short requestId) {
+    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId) {
       if(isSent())
         return false;
 
@@ -68,7 +68,7 @@ class CoreStatusRequest: public Request {
       if(packet.getType() != Net::Packet::TYPE_OK)
         return false; // TODO Logging
 
-      finished();
+      finished(Net::Packets::CoreStatusPacket(packet));
 
       setFinished();
       return true;
diff --git a/src/Common/Request/DisconnectRequest.h b/src/Common/Request/DisconnectRequest.h
index c20a3d0..3f6e018 100644
--- a/src/Common/Request/DisconnectRequest.h
+++ b/src/Common/Request/DisconnectRequest.h
@@ -50,7 +50,7 @@ class DisconnectRequest: public Request {
       return false;
     }
 
-    virtual bool sendRequest(Net::Connection *connection, unsigned short requestId) {
+    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId) {
       if(isSent())
         return false;
 
diff --git a/src/Common/Request/GSSAPIAuthRequest.h b/src/Common/Request/GSSAPIAuthRequest.h
index 138107e..ff92755 100644
--- a/src/Common/Request/GSSAPIAuthRequest.h
+++ b/src/Common/Request/GSSAPIAuthRequest.h
@@ -65,7 +65,7 @@ class GSSAPIAuthRequest : public Request {
       return false;
     }
 
-    virtual bool sendRequest(Net::Connection *connection, unsigned short requestId) {
+    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId) {
       if(isSent())
         return false;
 
diff --git a/src/Common/Request/IdentifyRequest.h b/src/Common/Request/IdentifyRequest.h
index e88ce4b..dfb6ce6 100644
--- a/src/Common/Request/IdentifyRequest.h
+++ b/src/Common/Request/IdentifyRequest.h
@@ -49,7 +49,7 @@ class IdentifyRequest: public Request {
       return false;
     }
 
-    virtual bool sendRequest(Net::Connection *connection, unsigned short requestId) {
+    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId) {
       if(isSent())
         return false;
 
diff --git a/src/Common/Request/Request.h b/src/Common/Request/Request.h
index 5c8d6c4..657a0a7 100644
--- a/src/Common/Request/Request.h
+++ b/src/Common/Request/Request.h
@@ -38,7 +38,7 @@ class Request : public RequestHandler {
   public:
     bool isSent() const {return sent;}
 
-    virtual bool sendRequest(Net::Connection *connection, unsigned short requestId) = 0;
+    virtual bool sendRequest(Net::Connection *connection, uint16_t requestId) = 0;
 };
 
 }