3 files changed, 16 insertions, 3 deletions
diff --git a/Swiften/Queries/GenericRequest.h b/Swiften/Queries/GenericRequest.h
index 68c86c5..b1b7f8a 100644
--- a/Swiften/Queries/GenericRequest.h
+++ b/Swiften/Queries/GenericRequest.h
@@ -22,6 +22,9 @@ namespace Swift {
 	template<typename PAYLOAD_TYPE>
 	class GenericRequest : public Request {
 		public:
+			typedef boost::shared_ptr<GenericRequest<PAYLOAD_TYPE> > ref;
+
+		public:
 			/**
 			 * Create a request suitable for client use.
 			 * @param type Iq type - Get or Set.
@@ -61,7 +64,7 @@ namespace Swift {
 				onResponse(boost::dynamic_pointer_cast<PAYLOAD_TYPE>(payload), error);
 			}
 
-		protected:
+		public:
 			boost::shared_ptr<PAYLOAD_TYPE> getPayloadGeneric() const {
 				return boost::dynamic_pointer_cast<PAYLOAD_TYPE>(getPayload());
 			}
diff --git a/Swiften/Queries/Request.cpp b/Swiften/Queries/Request.cpp
index 422f36c..40c8f60 100644
--- a/Swiften/Queries/Request.cpp
+++ b/Swiften/Queries/Request.cpp
@@ -23,7 +23,7 @@ Request::Request(IQ::Type type, const JID& sender, const JID& receiver, boost::s
 Request::Request(IQ::Type type, const JID& sender, const JID& receiver, IQRouter* router) : router_(router), type_(type), sender_(sender), receiver_(receiver), sent_(false) {
 }
 
-void Request::send() {
+std::string Request::send() {
 	assert(payload_);
 	assert(!sent_);
 	sent_ = true;
@@ -43,6 +43,7 @@ void Request::send() {
 	}
 
 	router_->sendIQ(iq);
+	return id_;
 }
 
 bool Request::handleIQ(boost::shared_ptr<IQ> iq) {
diff --git a/Swiften/Queries/Request.h b/Swiften/Queries/Request.h
index 5e3a4b8..f17cc11 100644
--- a/Swiften/Queries/Request.h
+++ b/Swiften/Queries/Request.h
@@ -24,12 +24,21 @@ namespace Swift {
 	 */
 	class SWIFTEN_API Request : public IQHandler, public boost::enable_shared_from_this<Request> {
 		public:
-			void send();
+			std::string send();
 
 			const JID& getReceiver() const {
 				return receiver_;
 			}
 
+			/**
+			 * Returns the ID of this request.
+			 * This will only be set after send() is called.
+			 */
+			const std::string& getID() const {
+				return id_;
+			}
+
+
 		protected:
 			/**
 			 * Constructs a request of a certain type to a specific receiver, and attaches the given