5 files changed, 6 insertions, 5 deletions
diff --git a/src/Common/Requests/DisconnectRequest.cpp b/src/Common/Requests/DisconnectRequest.cpp
index 6c4fa0d..16a6a78 100644
--- a/src/Common/Requests/DisconnectRequest.cpp
+++ b/src/Common/Requests/DisconnectRequest.cpp
@@ -32,7 +32,8 @@ void DisconnectRequest::sendRequest() {
 
 void DisconnectRequest::handlePacket(boost::shared_ptr<const XmlPacket> packet) {
   if(packet->getType() == "Error") {
-      signalFinished(Core::Exception((*packet)["Where"], (*packet)["ErrorCode"], (*packet)["SubCode"], (*packet)["SubSubCode"]));
+      signalFinished(Core::Exception(packet->get<const std::string&>("Where"), packet->get<Core::Exception::ErrorCode>("ErrorCode"),
+          packet->get<long>("SubCode"), packet->get<long>("SubSubCode")));
       return;
     }
   else if(packet->getType() != "OK") {
diff --git a/src/Common/Requests/GroupUserListRequest.cpp b/src/Common/Requests/GroupUserListRequest.cpp
index f77f559..87ab1b5 100644
--- a/src/Common/Requests/GroupUserListRequest.cpp
+++ b/src/Common/Requests/GroupUserListRequest.cpp
@@ -26,7 +26,7 @@ namespace Requests {
 void GroupUserListRequest::sendRequest() {
   Common::XmlPacket packet;
   packet.setType("ListGroupUsers");
-  packet.add("gid", gid);
+  packet.set("gid", gid);
 
   sendPacket(packet);
 }
diff --git a/src/Common/Requests/IdentifyRequest.cpp b/src/Common/Requests/IdentifyRequest.cpp
index 6cf09d1..0be8e83 100644
--- a/src/Common/Requests/IdentifyRequest.cpp
+++ b/src/Common/Requests/IdentifyRequest.cpp
@@ -28,7 +28,7 @@ void IdentifyRequest::sendRequest() {
   packet.setType("Identify");
 
   if(!hostname.empty())
-    packet.add("hostname", hostname);
+    packet.set("hostname", hostname);
 
   sendPacket(packet);
 }
diff --git a/src/Common/Requests/UserGroupListRequest.cpp b/src/Common/Requests/UserGroupListRequest.cpp
index ec7e23c..0c1a72f 100644
--- a/src/Common/Requests/UserGroupListRequest.cpp
+++ b/src/Common/Requests/UserGroupListRequest.cpp
@@ -26,7 +26,7 @@ namespace Requests {
 void UserGroupListRequest::sendRequest() {
   Common::XmlPacket packet;
   packet.setType("ListUserGroups");
-  packet.add("uid", uid);
+  packet.set("uid", uid);
 
   sendPacket(packet);
 }
diff --git a/src/Common/Requests/UserInfoRequest.cpp b/src/Common/Requests/UserInfoRequest.cpp
index 455eed6..b4b6940 100644
--- a/src/Common/Requests/UserInfoRequest.cpp
+++ b/src/Common/Requests/UserInfoRequest.cpp
@@ -26,7 +26,7 @@ namespace Requests {
 void UserInfoRequest::sendRequest() {
   Common::XmlPacket packet;
   packet.setType("GetUserInfo");
-  packet.add("uid", uid);
+  packet.set("uid", uid);
 
   sendPacket(packet);
 }