Index: ps/trunk/source/lobby/glooxwrapper/glooxwrapper.cpp
===================================================================
--- ps/trunk/source/lobby/glooxwrapper/glooxwrapper.cpp	(revision 22902)
+++ ps/trunk/source/lobby/glooxwrapper/glooxwrapper.cpp	(revision 22903)
@@ -1,896 +1,895 @@
 /* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
 #include "glooxwrapper.h"
 
 #include <gloox/connectionlistener.h>
 #include <gloox/error.h>
 #include <gloox/glooxversion.h>
 #include <gloox/messagehandler.h>
 
 #if OS_WIN
 const std::string gloox::EmptyString = "";
 #endif
 
 void* glooxwrapper::glooxwrapper_alloc(size_t size)
 {
 	void* p = malloc(size);
 	if (p == NULL)
 		throw std::bad_alloc();
 	return p;
 }
 
 void glooxwrapper::glooxwrapper_free(void* p)
 {
 	free(p);
 }
 
 
 namespace glooxwrapper
 {
 
 class ConnectionListenerWrapper : public gloox::ConnectionListener
 {
 	glooxwrapper::ConnectionListener* m_Wrapped;
 public:
 	ConnectionListenerWrapper(glooxwrapper::ConnectionListener* wrapped) : m_Wrapped(wrapped) {}
 
 	virtual void onConnect()
 	{
 		m_Wrapped->onConnect();
 	}
 
 	virtual void onDisconnect(gloox::ConnectionError e)
 	{
 		m_Wrapped->onDisconnect(e);
 	}
 
 	virtual bool onTLSConnect(const gloox::CertInfo& info)
 	{
 		glooxwrapper::CertInfo infoWrapped;
 #define COPY(n) infoWrapped.n = info.n
 		COPY(status);
 		COPY(chain);
 		COPY(issuer);
 		COPY(server);
 		COPY(date_from);
 		COPY(date_to);
 		COPY(protocol);
 		COPY(cipher);
 		COPY(mac);
 		COPY(compression);
 #undef COPY
 		return m_Wrapped->onTLSConnect(infoWrapped);
 	}
 };
 
 class IqHandlerWrapper : public gloox::IqHandler
 {
 	glooxwrapper::IqHandler* m_Wrapped;
 public:
 	IqHandlerWrapper(glooxwrapper::IqHandler* wrapped) : m_Wrapped(wrapped) {}
 
 	virtual bool handleIq(const gloox::IQ& iq)
 	{
 		glooxwrapper::IQ iqWrapper(iq);
 		return m_Wrapped->handleIq(iqWrapper);
 	}
 
 	virtual void handleIqID(const gloox::IQ& iq, int context)
 	{
 		glooxwrapper::IQ iqWrapper(iq);
 		m_Wrapped->handleIqID(iqWrapper, context);
 	}
 };
 
 class MessageHandlerWrapper : public gloox::MessageHandler
 {
 	glooxwrapper::MessageHandler* m_Wrapped;
 public:
 	MessageHandlerWrapper(glooxwrapper::MessageHandler* wrapped) : m_Wrapped(wrapped) {}
 
 	virtual void handleMessage(const gloox::Message& msg, gloox::MessageSession* UNUSED(session))
 	{
 		/* MessageSession not supported */
 		glooxwrapper::Message msgWrapper(const_cast<gloox::Message*>(&msg), false);
 		m_Wrapped->handleMessage(msgWrapper, NULL);
 	}
 };
 
 class MUCRoomHandlerWrapper : public gloox::MUCRoomHandler
 {
 	glooxwrapper::MUCRoomHandler* m_Wrapped;
 public:
 	MUCRoomHandlerWrapper(glooxwrapper::MUCRoomHandler* wrapped) : m_Wrapped(wrapped) {}
 
 	virtual ~MUCRoomHandlerWrapper() {}
 
 	virtual void handleMUCParticipantPresence(gloox::MUCRoom* room, const gloox::MUCRoomParticipant participant, const gloox::Presence& presence)
 	{
 		glooxwrapper::MUCRoom roomWrapper(room, false);
 		glooxwrapper::MUCRoomParticipant part;
 		glooxwrapper::JID nick(*participant.nick);
 		glooxwrapper::JID jid(*participant.jid);
 		glooxwrapper::JID actor(*participant.actor);
 		glooxwrapper::JID alternate(*participant.alternate);
 		part.nick = participant.nick ? &nick : NULL;
 		part.affiliation = participant.affiliation;
 		part.role = participant.role;
 		part.jid = participant.jid ? &jid : NULL;
 		part.flags = participant.flags;
 		part.reason = participant.reason;
 		part.actor = participant.actor ? &actor : NULL;
 		part.newNick = participant.newNick;
 		part.status = participant.status;
 		part.alternate = participant.alternate ? &alternate : NULL;
 
 		m_Wrapped->handleMUCParticipantPresence(roomWrapper, part, glooxwrapper::Presence(presence.presence()));
 
 		/* gloox 1.0 leaks some JIDs (fixed in 1.0.1), so clean them up */
 #if GLOOXVERSION == 0x10000
 		delete participant.jid;
 		delete participant.actor;
 		delete participant.alternate;
 #endif
 	}
 
 	virtual void handleMUCMessage(gloox::MUCRoom* room, const gloox::Message& msg, bool priv)
 	{
 		glooxwrapper::MUCRoom roomWrapper(room, false);
 		glooxwrapper::Message msgWrapper(const_cast<gloox::Message*>(&msg), false);
 		m_Wrapped->handleMUCMessage(roomWrapper, msgWrapper, priv);
 	}
 
 	virtual bool handleMUCRoomCreation(gloox::MUCRoom* UNUSED(room))
 	{
 		/* Not supported */
 		return false;
 	}
 
 	virtual void handleMUCSubject(gloox::MUCRoom* room, const std::string& nick, const std::string& subject)
 	{
 		glooxwrapper::MUCRoom roomWrapper(room, false);
 		m_Wrapped->handleMUCSubject(roomWrapper, nick, subject);
 	}
 
 	virtual void handleMUCInviteDecline(gloox::MUCRoom* UNUSED(room), const gloox::JID& UNUSED(invitee), const std::string& UNUSED(reason))
 	{
 		/* Not supported */
 	}
 
 	virtual void handleMUCError(gloox::MUCRoom* room, gloox::StanzaError error)
 	{
 		glooxwrapper::MUCRoom roomWrapper(room, false);
 		m_Wrapped->handleMUCError(roomWrapper, error);
 	}
 
 	virtual void handleMUCInfo(gloox::MUCRoom* UNUSED(room), int UNUSED(features), const std::string& UNUSED(name), const gloox::DataForm* UNUSED(infoForm))
 	{
 		/* Not supported */
 	}
 
 	virtual void handleMUCItems(gloox::MUCRoom* UNUSED(room), const gloox::Disco::ItemList& UNUSED(items))
 	{
 		/* Not supported */
 	}
 };
 
 class RegistrationHandlerWrapper : public gloox::RegistrationHandler
 {
 	glooxwrapper::RegistrationHandler* m_Wrapped;
 public:
 	RegistrationHandlerWrapper(glooxwrapper::RegistrationHandler* wrapped) : m_Wrapped(wrapped) {}
 
 	virtual void handleRegistrationFields(const gloox::JID& from, int fields, std::string instructions)
 	{
 		glooxwrapper::JID fromWrapped(from);
 		m_Wrapped->handleRegistrationFields(fromWrapped, fields, instructions);
 	}
 
 	virtual void handleAlreadyRegistered(const gloox::JID& from)
 	{
 		glooxwrapper::JID fromWrapped(from);
 		m_Wrapped->handleAlreadyRegistered(fromWrapped);
 	}
 
 	virtual void handleRegistrationResult(const gloox::JID& from, gloox::RegistrationResult regResult)
 	{
 		glooxwrapper::JID fromWrapped(from);
 		m_Wrapped->handleRegistrationResult(fromWrapped, regResult);
 	}
 
 	virtual void handleDataForm(const gloox::JID& UNUSED(from), const gloox::DataForm& UNUSED(form))
 	{
 		/* DataForm not supported */
 	}
 
 	virtual void handleOOB(const gloox::JID& UNUSED(from), const gloox::OOB& UNUSED(oob))
 	{
 		/* OOB not supported */
 	}
 };
 
 class StanzaExtensionWrapper : public gloox::StanzaExtension
 {
 public:
 	const glooxwrapper::StanzaExtension* m_Wrapped;
 	bool m_Owned;
 	std::string m_FilterString;
 
 	StanzaExtensionWrapper(const glooxwrapper::StanzaExtension* wrapped, bool owned) :
 	gloox::StanzaExtension(wrapped->extensionType()), m_Wrapped(wrapped), m_Owned(owned)
 	{
 		m_FilterString = m_Wrapped->filterString().to_string();
 	}
 
 	~StanzaExtensionWrapper()
 	{
 		if (m_Owned)
 			delete m_Wrapped;
 	}
 
 	virtual const std::string& filterString() const
 	{
 		return m_FilterString;
 	}
 
 	virtual gloox::StanzaExtension* newInstance(const gloox::Tag* tag) const
 	{
 		glooxwrapper::Tag* tagWrapper = glooxwrapper::Tag::allocate(const_cast<gloox::Tag*>(tag), false);
 		gloox::StanzaExtension* ret = new StanzaExtensionWrapper(m_Wrapped->newInstance(tagWrapper), true);
 		glooxwrapper::Tag::free(tagWrapper);
 		return ret;
 	}
 
 	virtual gloox::Tag* tag() const
 	{
 		glooxwrapper::Tag* wrapper = m_Wrapped->tag();
 		gloox::Tag* ret = wrapper->stealWrapped();
 		glooxwrapper::Tag::free(wrapper);
 		return ret;
 	}
 
 	virtual gloox::StanzaExtension* clone() const
 	{
 		return new StanzaExtensionWrapper(m_Wrapped->clone(), true);
 	}
 };
 
 class SessionHandlerWrapper : public gloox::Jingle::SessionHandler
 {
 public:
 	glooxwrapper::Jingle::SessionHandler* m_Wrapped;
 	bool m_Owned;
 
 	SessionHandlerWrapper(glooxwrapper::Jingle::SessionHandler* wrapped, bool owned)
 		: m_Wrapped(wrapped), m_Owned(owned) {}
 
 	~SessionHandlerWrapper()
 	{
 		if (m_Owned)
 			delete m_Wrapped;
 	}
 
 	virtual void handleSessionAction(gloox::Jingle::Action action, gloox::Jingle::Session* session, const gloox::Jingle::Session::Jingle* jingle)
 	{
 		glooxwrapper::Jingle::Session sessionWrapper(session, false);
 		glooxwrapper::Jingle::Session::Jingle jingleWrapper(jingle, false);
 		m_Wrapped->handleSessionAction(action, sessionWrapper, jingleWrapper);
 	}
 
 	virtual void handleSessionActionError(gloox::Jingle::Action UNUSED(action), gloox::Jingle::Session* UNUSED(session), const gloox::Error* UNUSED(error))
 	{
 	}
 
 	virtual void handleIncomingSession(gloox::Jingle::Session* UNUSED(session))
 	{
 	}
 };
 
 class ClientImpl
 {
 public:
 	// List of registered callback wrappers, to get deleted when Client is deleted
 	std::list<shared_ptr<gloox::ConnectionListener> > m_ConnectionListeners;
 	std::list<shared_ptr<gloox::MessageHandler> > m_MessageHandlers;
 	std::list<shared_ptr<gloox::IqHandler> > m_IqHandlers;
 };
 
 static const std::string XMLNS = "xmlns";
 static const std::string XMLNS_JINGLE_0AD_GAME = "urn:xmpp:jingle:apps:0ad-game:1";
 
 } // namespace glooxwrapper
 
 
 glooxwrapper::Client::Client(const string& server)
 {
 	m_Wrapped = new gloox::Client(server.to_string());
 	m_DiscoWrapper = new glooxwrapper::Disco(m_Wrapped->disco());
 	m_Impl = new ClientImpl;
 }
 
 glooxwrapper::Client::Client(const JID& jid, const string& password, int port)
 {
 	m_Wrapped = new gloox::Client(jid.getWrapped(), password.to_string(), port);
 	m_DiscoWrapper = new glooxwrapper::Disco(m_Wrapped->disco());
 	m_Impl = new ClientImpl;
 }
 
 glooxwrapper::Client::~Client()
 {
 	delete m_Wrapped;
 	delete m_DiscoWrapper;
 	delete m_Impl;
 }
 
 bool glooxwrapper::Client::connect(bool block)
 {
 	return m_Wrapped->connect(block);
 }
 
 gloox::ConnectionError glooxwrapper::Client::recv(int timeout)
 {
 	return m_Wrapped->recv(timeout);
 }
 
 const glooxwrapper::string glooxwrapper::Client::getID() const
 {
 	return m_Wrapped->getID();
 }
 
 void glooxwrapper::Client::send(const IQ& iq)
 {
 	m_Wrapped->send(iq.getWrapped());
 }
 
 void glooxwrapper::Client::setTls(gloox::TLSPolicy tls)
 {
 	m_Wrapped->setTls(tls);
 }
 
 void glooxwrapper::Client::setCompression(bool compression)
 {
 	m_Wrapped->setCompression(compression);
 }
 
 void glooxwrapper::Client::setSASLMechanisms(int mechanisms)
 {
 	m_Wrapped->setSASLMechanisms(mechanisms);
 }
 
 void glooxwrapper::Client::disconnect()
 {
 	m_Wrapped->disconnect();
 }
 
 void glooxwrapper::Client::registerStanzaExtension(glooxwrapper::StanzaExtension* ext)
 {
 	// ~StanzaExtensionFactory() deletes this new StanzaExtensionWrapper
 	m_Wrapped->registerStanzaExtension(new StanzaExtensionWrapper(ext, true));
 }
 
 void glooxwrapper::Client::registerConnectionListener(glooxwrapper::ConnectionListener* hnd)
 {
 	gloox::ConnectionListener* listener = new ConnectionListenerWrapper(hnd);
 	m_Wrapped->registerConnectionListener(listener);
 	m_Impl->m_ConnectionListeners.push_back(shared_ptr<gloox::ConnectionListener>(listener));
 }
 
 void glooxwrapper::Client::registerMessageHandler(glooxwrapper::MessageHandler* hnd)
 {
 	gloox::MessageHandler* handler = new MessageHandlerWrapper(hnd);
 	m_Wrapped->registerMessageHandler(handler);
 	m_Impl->m_MessageHandlers.push_back(shared_ptr<gloox::MessageHandler>(handler));
 }
 
 void glooxwrapper::Client::registerIqHandler(glooxwrapper::IqHandler* ih, int exttype)
 {
 	gloox::IqHandler* handler = new IqHandlerWrapper(ih);
 	m_Wrapped->registerIqHandler(handler, exttype);
 	m_Impl->m_IqHandlers.push_back(shared_ptr<gloox::IqHandler>(handler));
 }
 
 bool glooxwrapper::Client::removePresenceExtension(int type)
 {
 	return m_Wrapped->removePresenceExtension(type);
 }
 
 void glooxwrapper::Client::setPresence(gloox::Presence::PresenceType pres, int priority, const string& status)
 {
 	m_Wrapped->setPresence(pres, priority, status.to_string());
 }
 
 
 glooxwrapper::DelayedDelivery::DelayedDelivery(const gloox::DelayedDelivery* wrapped)
 {
 	m_Wrapped = wrapped;
 }
 
 const glooxwrapper::string glooxwrapper::DelayedDelivery::stamp() const
 {
 	return m_Wrapped->stamp();
 }
 
 
 glooxwrapper::Disco::Disco(gloox::Disco* wrapped)
 {
 	m_Wrapped = wrapped;
 }
 
 void glooxwrapper::Disco::setVersion(const string& name, const string& version, const string& os)
 {
 	m_Wrapped->setVersion(name.to_string(), version.to_string(), os.to_string());
 }
 
 void glooxwrapper::Disco::setIdentity(const string& category, const string& type, const string& name)
 {
 	m_Wrapped->setIdentity(category.to_string(), type.to_string(), name.to_string());
 }
 
 
 glooxwrapper::IQ::IQ(gloox::IQ::IqType type, const JID& to, const string& id)
 {
 	m_Wrapped = new gloox::IQ(type, to.getWrapped(), id.to_string());
 	m_Owned = true;
 }
 
 glooxwrapper::IQ::~IQ()
 {
 	if (m_Owned)
 		delete m_Wrapped;
 }
 
 void glooxwrapper::IQ::addExtension(const glooxwrapper::StanzaExtension* se)
 {
 	m_Wrapped->addExtension(new StanzaExtensionWrapper(se, true));
 }
 
 const glooxwrapper::StanzaExtension* glooxwrapper::IQ::findExtension(int type) const
 {
 	const gloox::StanzaExtension* ext = m_Wrapped->findExtension(type);
 	if (!ext)
 		return NULL;
 	return static_cast<const StanzaExtensionWrapper*>(ext)->m_Wrapped;
 }
 
 gloox::StanzaError glooxwrapper::IQ::error_error() const
 {
 	const gloox::Error* error = m_Wrapped->error();
 	if (!error)
 		return gloox::StanzaErrorInternalServerError;
 	return error->error();
 }
 
 glooxwrapper::Tag* glooxwrapper::IQ::tag() const
 {
 	return Tag::allocate(m_Wrapped->tag(), true);
 }
 
 gloox::IQ::IqType glooxwrapper::IQ::subtype() const
 {
 	return m_Wrapped->subtype();
 }
 
 const glooxwrapper::string glooxwrapper::IQ::id() const
 {
 	return m_Wrapped->id();
 }
 
 const gloox::JID& glooxwrapper::IQ::from() const
 {
 	return m_Wrapped->from();
 }
 
 glooxwrapper::JID::JID()
 {
 	m_Wrapped = new gloox::JID();
 	m_Owned = true;
 }
 
 glooxwrapper::JID::JID(const glooxwrapper::string& jid)
 {
 	m_Wrapped = new gloox::JID(jid.to_string());
 	m_Owned = true;
 }
 
 void glooxwrapper::JID::init(const char* data, size_t len)
 {
 	m_Wrapped = new gloox::JID(std::string(data, data+len));
 	m_Owned = true;
 }
 
 glooxwrapper::JID::~JID()
 {
 	if (m_Owned)
 		delete m_Wrapped;
 }
 
 glooxwrapper::string glooxwrapper::JID::username() const
 {
 	return m_Wrapped->username();
 }
 
 glooxwrapper::string glooxwrapper::JID::resource() const
 {
 	return m_Wrapped->resource();
 };
 
 
 glooxwrapper::Message::Message(gloox::Message* wrapped, bool owned)
-	: m_Wrapped(wrapped), m_Owned(owned)
+	: m_Wrapped(wrapped),
+	  m_Owned(owned),
+	  m_From(m_Wrapped->from()),
+	  m_DelayedDelivery(m_Wrapped->when() ? new glooxwrapper::DelayedDelivery(m_Wrapped->when()) : nullptr)
 {
-	m_From = new glooxwrapper::JID(m_Wrapped->from());
 }
 
 glooxwrapper::Message::~Message()
 {
 	if (m_Owned)
 		delete m_Wrapped;
-	delete m_From;
+	delete m_DelayedDelivery;
 }
 
 gloox::Message::MessageType glooxwrapper::Message::subtype() const
 {
 	return m_Wrapped->subtype();
 }
 
 const glooxwrapper::JID& glooxwrapper::Message::from() const
 {
-	return *m_From;
+	return m_From;
 }
 
 glooxwrapper::string glooxwrapper::Message::body() const
 {
 	return m_Wrapped->body();
 }
 
 glooxwrapper::string glooxwrapper::Message::subject(const string& lang) const
 {
 	return m_Wrapped->subject(lang.to_string());
 }
 
 glooxwrapper::string glooxwrapper::Message::thread() const
 {
 	return m_Wrapped->thread();
 }
 
 const glooxwrapper::DelayedDelivery* glooxwrapper::Message::when() const
 {
-	const gloox::DelayedDelivery* wrapped = m_Wrapped->when();
-	if (wrapped == 0)
-		return 0;
-	return new glooxwrapper::DelayedDelivery(wrapped);
+	return m_DelayedDelivery;
 }
 
 glooxwrapper::MUCRoom::MUCRoom(gloox::MUCRoom* room, bool owned)
 	: m_Wrapped(room), m_Owned(owned), m_HandlerWrapper(nullptr)
 {
 }
 
 glooxwrapper::MUCRoom::MUCRoom(Client* parent, const JID& nick, MUCRoomHandler* mrh, MUCRoomConfigHandler* UNUSED(mrch))
 {
 	m_HandlerWrapper = new MUCRoomHandlerWrapper(mrh);
 	m_Wrapped = new gloox::MUCRoom(parent ? parent->getWrapped() : NULL, nick.getWrapped(), m_HandlerWrapper);
 	m_Owned = true;
 }
 
 glooxwrapper::MUCRoom::~MUCRoom()
 {
 	if (m_Owned)
 		delete m_Wrapped;
 
 	delete m_HandlerWrapper;
 }
 
 const glooxwrapper::string glooxwrapper::MUCRoom::nick() const
 {
 	return m_Wrapped->nick();
 }
 
 const glooxwrapper::string glooxwrapper::MUCRoom::name() const
 {
 	return m_Wrapped->name();
 }
 
 const glooxwrapper::string glooxwrapper::MUCRoom::service() const
 {
 	return m_Wrapped->service();
 }
 
 void glooxwrapper::MUCRoom::join(gloox::Presence::PresenceType type, const string& status, int priority)
 {
 	m_Wrapped->join(type, status.to_string(), priority);
 }
 
 void glooxwrapper::MUCRoom::leave(const string& msg)
 {
 	m_Wrapped->leave(msg.to_string());
 }
 
 void glooxwrapper::MUCRoom::send(const string& message)
 {
 	m_Wrapped->send(message.to_string());
 }
 
 void glooxwrapper::MUCRoom::setNick(const string& nick)
 {
 	m_Wrapped->setNick(nick.to_string());
 }
 
 void glooxwrapper::MUCRoom::setPresence(gloox::Presence::PresenceType presence, const string& msg)
 {
 	m_Wrapped->setPresence(presence, msg.to_string());
 }
 
 void glooxwrapper::MUCRoom::setRequestHistory(int value, gloox::MUCRoom::HistoryRequestType type)
 {
 	m_Wrapped->setRequestHistory(value, type);
 }
 
 void glooxwrapper::MUCRoom::kick(const string& nick, const string& reason)
 {
 	m_Wrapped->kick(nick.to_string(), reason.to_string());
 }
 
 void glooxwrapper::MUCRoom::ban(const string& nick, const string& reason)
 {
 	m_Wrapped->ban(nick.to_string(), reason.to_string());
 }
 
 
 glooxwrapper::Registration::Registration(Client* parent)
 {
 	m_Wrapped = new gloox::Registration(parent->getWrapped());
 }
 
 glooxwrapper::Registration::~Registration()
 {
 	delete m_Wrapped;
 }
 
 void glooxwrapper::Registration::fetchRegistrationFields()
 {
 	m_Wrapped->fetchRegistrationFields();
 }
 
 bool glooxwrapper::Registration::createAccount(int fields, const glooxwrapper::RegistrationFields& values)
 {
 	gloox::RegistrationFields valuesUnwrapped;
 #define COPY(n) valuesUnwrapped.n = values.n.to_string()
 	COPY(username);
 	COPY(nick);
 	COPY(password);
 	COPY(name);
 	COPY(first);
 	COPY(last);
 	COPY(email);
 	COPY(address);
 	COPY(city);
 	COPY(state);
 	COPY(zip);
 	COPY(phone);
 	COPY(url);
 	COPY(date);
 	COPY(misc);
 	COPY(text);
 #undef COPY
 	return m_Wrapped->createAccount(fields, valuesUnwrapped);
 }
 
 void glooxwrapper::Registration::registerRegistrationHandler(RegistrationHandler* rh)
 {
 	gloox::RegistrationHandler* handler = new RegistrationHandlerWrapper(rh);
 	m_Wrapped->registerRegistrationHandler(handler);
 	m_RegistrationHandlers.push_back(shared_ptr<gloox::RegistrationHandler>(handler));
 }
 
 
 glooxwrapper::Tag::Tag(const string& name)
 {
 	m_Wrapped = new gloox::Tag(name.to_string());
 	m_Owned = true;
 }
 
 glooxwrapper::Tag::Tag(const string& name, const string& cdata)
 {
 	m_Wrapped = new gloox::Tag(name.to_string(), cdata.to_string());
 	m_Owned = true;
 }
 
 glooxwrapper::Tag::~Tag()
 {
 	if (m_Owned)
 		delete m_Wrapped;
 }
 
 glooxwrapper::Tag* glooxwrapper::Tag::allocate(const string& name)
 {
 	return new glooxwrapper::Tag(name);
 }
 
 glooxwrapper::Tag* glooxwrapper::Tag::allocate(const string& name, const string& cdata)
 {
 	return new glooxwrapper::Tag(name, cdata);
 }
 
 glooxwrapper::Tag* glooxwrapper::Tag::allocate(gloox::Tag* wrapped, bool owned)
 {
 	return new glooxwrapper::Tag(wrapped, owned);
 }
 
 void glooxwrapper::Tag::free(const glooxwrapper::Tag* tag)
 {
 	delete tag;
 }
 
 bool glooxwrapper::Tag::addAttribute(const string& name, const string& value)
 {
 	return m_Wrapped->addAttribute(name.to_string(), value.to_string());
 }
 
 glooxwrapper::string glooxwrapper::Tag::findAttribute(const string& name) const
 {
 	return m_Wrapped->findAttribute(name.to_string());
 }
 
 glooxwrapper::Tag* glooxwrapper::Tag::clone() const
 {
 	return new glooxwrapper::Tag(m_Wrapped->clone(), true);
 }
 
 glooxwrapper::string glooxwrapper::Tag::xmlns() const
 {
 	return m_Wrapped->xmlns();
 }
 
 bool glooxwrapper::Tag::setXmlns(const string& xmlns)
 {
 	return m_Wrapped->setXmlns(xmlns.to_string());
 }
 
 glooxwrapper::string glooxwrapper::Tag::xml() const
 {
 	return m_Wrapped->xml();
 }
 
 void glooxwrapper::Tag::addChild(Tag* child)
 {
 	m_Wrapped->addChild(child->stealWrapped());
 	Tag::free(child);
 }
 
 glooxwrapper::string glooxwrapper::Tag::name() const
 {
 	return m_Wrapped->name();
 }
 
 glooxwrapper::string glooxwrapper::Tag::cdata() const
 {
 	return m_Wrapped->cdata();
 }
 
 const glooxwrapper::Tag* glooxwrapper::Tag::findTag_clone(const string& expression) const
 {
 	const gloox::Tag* tag = m_Wrapped->findTag(expression.to_string());
 	if (!tag)
 		return NULL;
 	return new glooxwrapper::Tag(const_cast<gloox::Tag*>(tag), false);
 }
 
 glooxwrapper::ConstTagList glooxwrapper::Tag::findTagList_clone(const string& expression) const
 {
 	glooxwrapper::ConstTagList tagListWrapper;
 	for (const gloox::Tag* const& t : m_Wrapped->findTagList(expression.to_string()))
 		tagListWrapper.push_back(new glooxwrapper::Tag(const_cast<gloox::Tag*>(t), false));
 	return tagListWrapper;
 }
 
 glooxwrapper::Jingle::Plugin::~Plugin()
 {
 	if (m_Owned)
 		delete m_Wrapped;
 }
 
 const glooxwrapper::Jingle::Plugin glooxwrapper::Jingle::Plugin::findPlugin(int type) const
 {
 	return glooxwrapper::Jingle::Plugin(m_Wrapped->findPlugin(type), false);
 }
 
 glooxwrapper::Jingle::ICEUDP::Candidate glooxwrapper::Jingle::Session::Jingle::getCandidate() const
 {
 	const gloox::Jingle::Content* content = static_cast<const gloox::Jingle::Content*>(m_Wrapped->plugins().front());
 	if (!content)
 		return glooxwrapper::Jingle::ICEUDP::Candidate();
 
 	const gloox::Jingle::ICEUDP* iceUDP = static_cast<const gloox::Jingle::ICEUDP*>(content->findPlugin(gloox::Jingle::PluginICEUDP));
 	if (!iceUDP)
 		return glooxwrapper::Jingle::ICEUDP::Candidate();
 
 	gloox::Jingle::ICEUDP::Candidate glooxCandidate = iceUDP->candidates().front();
 	return glooxwrapper::Jingle::ICEUDP::Candidate{glooxCandidate.ip, glooxCandidate.port};
 }
 
 glooxwrapper::Jingle::Session::Session(gloox::Jingle::Session* wrapped, bool owned)
 	: m_Wrapped(wrapped), m_Owned(owned)
 {
 }
 
 glooxwrapper::Jingle::Session::~Session()
 {
 	if (m_Owned)
 		delete m_Wrapped;
 }
 
 bool glooxwrapper::Jingle::Session::sessionInitiate(char* ipStr, u16 port)
 {
 	gloox::Jingle::ICEUDP::CandidateList candidateList;
 
 	candidateList.push_back(gloox::Jingle::ICEUDP::Candidate
 	{
 		"1", // component_id,
 		"1", // foundation
 		"0", // andidate_generation
 		"1", // candidate_id
 		ipStr,
 		"0", // network
 		port,
 		0, // priotiry
 		"udp",
 		"", // base_ip
 		0, // base_port
 		gloox::Jingle::ICEUDP::ServerReflexive
 	});
 
 	// sessionInitiate deletes the new Content, and
 	// the Plugin destructor inherited by Content frees the ICEUDP plugin.
 
 	gloox::Jingle::PluginList pluginList;
 	pluginList.push_back(new gloox::Jingle::ICEUDP(/*local_pwd*/"", /*local_ufrag*/"", candidateList));
 
 	return m_Wrapped->sessionInitiate(new gloox::Jingle::Content(std::string("game-data"), pluginList));
 }
 
 glooxwrapper::SessionManager::SessionManager(Client* parent, Jingle::SessionHandler* sh)
 {
 	m_HandlerWrapper = new SessionHandlerWrapper(sh, false);
 	m_Wrapped = new gloox::Jingle::SessionManager(parent->getWrapped(), m_HandlerWrapper);
 }
 
 glooxwrapper::SessionManager::~SessionManager()
 {
 	delete m_Wrapped;
 	delete m_HandlerWrapper;
 }
 
 void glooxwrapper::SessionManager::registerPlugins()
 {
 	// This calls m_factory.registerPlugin (see jinglesessionmanager.cpp), hence
 	// ~PluginFactory() will delete these new plugin templates.
 	m_Wrapped->registerPlugin(new gloox::Jingle::Content());
 	m_Wrapped->registerPlugin(new gloox::Jingle::ICEUDP());
 }
 
 glooxwrapper::Jingle::Session glooxwrapper::SessionManager::createSession(const JID& callee)
 {
 	// The wrapped gloox SessionManager keeps track of this session and deletes it on ~SessionManager().
 	gloox::Jingle::Session* glooxSession = m_Wrapped->createSession(callee.getWrapped(), m_HandlerWrapper);
 
 	// Hence the glooxwrapper::Jingle::Session may not own the gloox::Jingle::Session.
 	return glooxwrapper::Jingle::Session(glooxSession, false);
 }
Index: ps/trunk/source/lobby/glooxwrapper/glooxwrapper.h
===================================================================
--- ps/trunk/source/lobby/glooxwrapper/glooxwrapper.h	(revision 22902)
+++ ps/trunk/source/lobby/glooxwrapper/glooxwrapper.h	(revision 22903)
@@ -1,695 +1,696 @@
 /* Copyright (C) 2019 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * 0 A.D. is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef INCLUDED_GLOOXWRAPPER_H
 #define INCLUDED_GLOOXWRAPPER_H
 
 /*
 
 The gloox API uses various STL types (std::string, std::list, etc), and
 it has functions that acquire/release ownership of objects and expect the
 library's user's 'new'/'delete' functions to be compatible with the library's.
 
 These assumptions are invalid when the game and library are built with
 different compiler versions (or the same version with different build flags):
 the STL types have different layouts, and new/delete can use different heaps.
 
 We want to let people build the game on Windows with any compiler version
 (VC2008, 2010, 2012, 2013, and debug vs release), without requiring them to
 rebuild the gloox library themselves. And we don't want to provide ~8 different
 prebuilt versions of the library.
 
 glooxwrapper replaces the gloox API with a version that is safe to use across
 compiler versions. glooxwrapper and gloox must be compiled together with the
 same version, but the resulting library can be used with any other compiler.
 
 This is the small subset of the API that the game currently uses, with no
 attempt to be comprehensive.
 
 General design and rules:
 
  * There is a strict boundary between gloox+glooxwrapper.cpp, and the game
    code that includes glooxwrapper.h.
    Objects allocated with new/delete on one side of the boundary must be
    freed/allocated on the same side.
    Objects allocated with glooxwrapper_alloc()/glooxwrapper_delete() can be
    freely shared across the boundary.
 
  * glooxwrapper.h and users of glooxwrapper must not use any types from
    the gloox namespace, except for enums.
 
  * std::string is replaced with glooxwrapper::string,
    std::list with glooxwrapper::list
 
  * Most glooxwrapper classes are simple wrappers around gloox classes.
    Some always take ownership of their wrapped gloox object (i.e. their
    destructor will delete the wrapped object too); some never do; and some
    can be used either way (indicated by an m_Owned field).
 
 */
 
 #if OS_WIN
 # include "lib/sysdep/os/win/win.h"
 // Prevent gloox pulling in windows.h
 # define _WINDOWS_
 #endif
 
 #include <gloox/client.h>
 #include <gloox/mucroom.h>
 #include <gloox/registration.h>
 #include <gloox/message.h>
 #include <gloox/jinglecontent.h>
 #include <gloox/jingleiceudp.h>
 #include <gloox/jinglesessionhandler.h>
 #include <gloox/jinglesessionmanager.h>
 
 #include <cstring>
 
 #if OS_WIN
 #define GLOOXWRAPPER_API __declspec(dllexport)
 #else
 #define GLOOXWRAPPER_API
 #endif
 
 namespace glooxwrapper
 {
 	class Client;
 	class DataForm;
 	class DelayedDelivery;
 	class Disco;
 	class IQ;
 	class JID;
 	class MUCRoom;
 	class MUCRoomConfigHandler;
 	class Message;
 	class MessageSession;
 	class OOB;
 	class Presence;
 	class StanzaError;
 	class StanzaExtension;
 	class Tag;
 
 	class ClientImpl;
 	class MUCRoomHandlerWrapper;
 	class SessionHandlerWrapper;
 
 	GLOOXWRAPPER_API void* glooxwrapper_alloc(size_t size);
 	GLOOXWRAPPER_API void glooxwrapper_free(void* p);
 
 	class string
 	{
 	private:
 		size_t m_Size;
 		char* m_Data;
 	public:
 		string()
 		{
 			m_Size = 0;
 			m_Data = (char*)glooxwrapper_alloc(1);
 			m_Data[0] = '\0';
 		}
 
 		string(const string& str)
 		{
 			m_Size = str.m_Size;
 			m_Data = (char*)glooxwrapper_alloc(m_Size + 1);
 			memcpy(m_Data, str.m_Data, m_Size + 1);
 		}
 
 		string(const std::string& str) : m_Data(NULL)
 		{
 			m_Size = str.size();
 			m_Data = (char*)glooxwrapper_alloc(m_Size + 1);
 			memcpy(m_Data, str.c_str(), m_Size + 1);
 		}
 
 		string(const char* str)
 		{
 			m_Size = strlen(str);
 			m_Data = (char*)glooxwrapper_alloc(m_Size + 1);
 			memcpy(m_Data, str, m_Size + 1);
 		}
 
 		string& operator=(const string& str)
 		{
 			if (this != &str)
 			{
 				glooxwrapper_free(m_Data);
 				m_Size = str.m_Size;
 				m_Data = (char*)glooxwrapper_alloc(m_Size + 1);
 				memcpy(m_Data, str.m_Data, m_Size + 1);
 			}
 			return *this;
 		}
 
 		~string()
 		{
 			glooxwrapper_free(m_Data);
 		}
 
 		/**
 		 * Gloox strings are UTF encoded, so don't forget to decode it before passing it to the GUI!
 		 */
 		std::string to_string() const
 		{
 			return std::string(m_Data, m_Size);
 		}
 
 		const char* c_str() const
 		{
 			return m_Data;
 		}
 
 		bool empty() const
 		{
 			return m_Size == 0;
 		}
 
 		bool operator==(const char* str) const
 		{
 			return strcmp(m_Data, str) == 0;
 		}
 
 		bool operator!=(const char* str) const
 		{
 			return strcmp(m_Data, str) != 0;
 		}
 
 		bool operator==(const string& str) const
 		{
 			return strcmp(m_Data, str.m_Data) == 0;
 		}
 
 		bool operator<(const string& str) const
 		{
 			return strcmp(m_Data, str.m_Data) < 0;
 		}
 	};
 
 	static inline std::ostream& operator<<(std::ostream& stream, const string& string)
 	{
 		return stream << string.c_str();
 	}
 
 	template<typename T>
 	class list
 	{
 	private:
 		struct node
 		{
 			node(const T& item) : m_Item(item), m_Next(NULL) {}
 			T m_Item;
 			node* m_Next;
 		};
 		node* m_Head;
 		node* m_Tail;
 
 	public:
 		struct const_iterator
 		{
 			const node* m_Node;
 			const_iterator(const node* n) : m_Node(n) {}
 			bool operator!=(const const_iterator& it) { return m_Node != it.m_Node; }
 			const_iterator& operator++() { m_Node = m_Node->m_Next; return *this; }
 			const T& operator*() { return m_Node->m_Item; }
 		};
 		const_iterator begin() const { return const_iterator(m_Head); }
 		const_iterator end() const { return const_iterator(NULL); }
 
 		list() : m_Head(NULL), m_Tail(NULL) {}
 
 		list(const list& src) : m_Head(NULL), m_Tail(NULL)
 		{
 			*this = src;
 		}
 
 		list& operator=(const list& src)
 		{
 			if (this != &src)
 			{
 				clear();
 				for (node* n = src.m_Head; n; n = n->m_Next)
 					push_back(n->m_Item);
 			}
 			return *this;
 		}
 
 		~list()
 		{
 			clear();
 		}
 
 		void push_back(const T& item)
 		{
 			node* n = new (glooxwrapper_alloc(sizeof(node))) node(item);
 			if (m_Tail)
 				m_Tail->m_Next = n;
 			m_Tail = n;
 			if (!m_Head)
 				m_Head = n;
 		}
 
 		void clear()
 		{
 			node* n = m_Head;
 			while (n)
 			{
 				node* next = n->m_Next;
 				glooxwrapper_free(n);
 				n = next;
 			}
 			m_Head = m_Tail = NULL;
 		}
 
 		const T& front() const
 		{
 			return *begin();
 		}
 	};
 
 	typedef glooxwrapper::list<Tag*> TagList;
 	typedef glooxwrapper::list<const Tag*> ConstTagList;
 
 	struct CertInfo
 	{
 		int status;
 		bool chain;
 		string issuer;
 		string server;
 		int date_from;
 		int date_to;
 		string protocol;
 		string cipher;
 		string mac;
 		string compression;
 	};
 
 	struct RegistrationFields
 	{
 		string username;
 		string nick;
 		string password;
 		string name;
 		string first;
 		string last;
 		string email;
 		string address;
 		string city;
 		string state;
 		string zip;
 		string phone;
 		string url;
 		string date;
 		string misc;
 		string text;
 	};
 
 	struct MUCRoomParticipant
 	{
 		JID* nick;
 		gloox::MUCRoomAffiliation affiliation;
 		gloox::MUCRoomRole role;
 		JID* jid;
 		int flags;
 		string reason;
 		JID* actor;
 		string newNick;
 		string status;
 		JID* alternate;
 	};
 
 
 	class GLOOXWRAPPER_API ConnectionListener
 	{
 	public:
 		virtual ~ConnectionListener() {}
 		virtual void onConnect() = 0;
 		virtual void onDisconnect(gloox::ConnectionError e) = 0;
 		virtual bool onTLSConnect(const CertInfo& info) = 0;
 	};
 
 	class GLOOXWRAPPER_API IqHandler
 	{
 	public:
 		virtual ~IqHandler() {}
 		virtual bool handleIq(const IQ& iq) = 0;
 		virtual void handleIqID(const IQ& iq, int context) = 0;
 	};
 
 	class GLOOXWRAPPER_API MessageHandler
 	{
 	public:
 		virtual ~MessageHandler() {}
 		virtual void handleMessage(const Message& msg, MessageSession* session = 0) = 0; // MessageSession not supported
 	};
 
 	class GLOOXWRAPPER_API MUCRoomHandler
 	{
 	public:
 		virtual ~MUCRoomHandler() {}
 		virtual void handleMUCParticipantPresence(MUCRoom& room, const MUCRoomParticipant participant, const Presence& presence) = 0;
 		virtual void handleMUCMessage(MUCRoom& room, const Message& msg, bool priv) = 0;
 		virtual void handleMUCError(MUCRoom& room, gloox::StanzaError error) = 0;
 		virtual void handleMUCSubject(MUCRoom& room, const string& nick, const string& subject) = 0;
 	};
 
 	class GLOOXWRAPPER_API RegistrationHandler
 	{
 	public:
 		virtual ~RegistrationHandler() {}
 		virtual void handleRegistrationFields(const JID& from, int fields, string instructions) = 0;
 		virtual void handleAlreadyRegistered(const JID& from) = 0;
 		virtual void handleRegistrationResult(const JID& from, gloox::RegistrationResult regResult) = 0;
 		virtual void handleDataForm(const JID& from, const DataForm& form) = 0; // DataForm not supported
 		virtual void handleOOB(const JID& from, const OOB& oob) = 0; // OOB not supported
 	};
 
 	class GLOOXWRAPPER_API StanzaExtension
 	{
 	public:
 		StanzaExtension(int type) : m_extensionType(type) {}
 		virtual ~StanzaExtension() {}
 		virtual const string& filterString() const = 0;
 		virtual StanzaExtension* newInstance(const Tag* tag) const = 0;
 		virtual glooxwrapper::Tag* tag() const = 0;
 		virtual StanzaExtension* clone() const = 0;
 
 		int extensionType() const { return m_extensionType; }
 	private:
 		int m_extensionType;
 	};
 
 
 	class GLOOXWRAPPER_API Client
 	{
 		NONCOPYABLE(Client);
 	private:
 		gloox::Client* m_Wrapped;
 		ClientImpl* m_Impl;
 		Disco* m_DiscoWrapper;
 
 	public:
 		gloox::Client* getWrapped() { return m_Wrapped; }
 
 		bool connect(bool block = true);
 		gloox::ConnectionError recv(int timeout = -1);
 		const string getID() const;
 		void send(const IQ& iq);
 
 		void setTls(gloox::TLSPolicy tls);
 		void setCompression(bool compression);
 
 		void setSASLMechanisms(int mechanisms);
 		void registerStanzaExtension(StanzaExtension* ext);
 		void registerConnectionListener(ConnectionListener* cl);
 		void registerIqHandler(IqHandler* ih, int exttype);
 		void registerMessageHandler(MessageHandler* mh);
 
 		bool removePresenceExtension(int type);
 
 		Disco* disco() const { return m_DiscoWrapper; }
 
 		Client(const string& server);
 		Client(const JID& jid, const string& password, int port = -1);
 		~Client();
 
 		void setPresence(gloox::Presence::PresenceType pres, int priority, const string& status = "");
 		void disconnect();
 	};
 
 	class GLOOXWRAPPER_API DelayedDelivery
 	{
 		NONCOPYABLE(DelayedDelivery);
 	private:
 		const gloox::DelayedDelivery* m_Wrapped;
 	public:
 		DelayedDelivery(const gloox::DelayedDelivery* wrapped);
 		const string stamp() const;
 	};
 
 	class GLOOXWRAPPER_API Disco
 	{
 		NONCOPYABLE(Disco);
 	private:
 		gloox::Disco* m_Wrapped;
 	public:
 		Disco(gloox::Disco* wrapped);
 		void setVersion(const string& name, const string& version, const string& os = "");
 		void setIdentity(const string& category, const string& type, const string& name = "");
 	};
 
 	class GLOOXWRAPPER_API IQ
 	{
 		NONCOPYABLE(IQ);
 	private:
 		gloox::IQ* m_Wrapped;
 		bool m_Owned;
 	public:
 		const gloox::IQ& getWrapped() const { return *m_Wrapped; }
 		IQ(const gloox::IQ& iq) : m_Wrapped(const_cast<gloox::IQ*>(&iq)), m_Owned(false) { }
 
 		IQ(gloox::IQ::IqType type, const JID& to, const string& id);
 		~IQ();
 
 		void addExtension(const StanzaExtension* se);
 		const StanzaExtension* findExtension(int type) const;
 
 		template<class T>
 		inline const T* findExtension(int type) const
 		{
 			return static_cast<const T*>(findExtension(type));
 		}
 
 		gloox::IQ::IqType subtype() const;
 		const string id() const;
 		const gloox::JID& from() const;
 
 		gloox::StanzaError error_error() const; // wrapper for ->error()->error()
 		Tag* tag() const;
 	};
 
 	class GLOOXWRAPPER_API JID
 	{
 		NONCOPYABLE(JID);
 	private:
 		gloox::JID* m_Wrapped;
 		bool m_Owned;
 		void init(const char* data, size_t len);
 	public:
 		const gloox::JID& getWrapped() const { return *m_Wrapped; }
 		JID(const gloox::JID& jid) : m_Wrapped(const_cast<gloox::JID*>(&jid)), m_Owned(false) { }
 
 		JID();
 		JID(const string& jid);
 		JID(const std::string& jid) { init(jid.c_str(), jid.size()); }
 		~JID();
 
 		string username() const;
 		string resource() const;
 	};
 
 	class GLOOXWRAPPER_API Message
 	{
 		NONCOPYABLE(Message);
 	private:
 		gloox::Message* m_Wrapped;
 		bool m_Owned;
-		glooxwrapper::JID* m_From;
+		glooxwrapper::JID m_From;
+		glooxwrapper::DelayedDelivery* m_DelayedDelivery;
 	public:
 		Message(gloox::Message* wrapped, bool owned);
 		~Message();
 		gloox::Message::MessageType subtype() const;
 		const JID& from() const;
 		string body() const;
 		string subject(const string& lang = "default") const;
 		string thread() const;
 		const glooxwrapper::DelayedDelivery* when() const;
 	};
 
 	class GLOOXWRAPPER_API MUCRoom
 	{
 		NONCOPYABLE(MUCRoom);
 	private:
 		gloox::MUCRoom* m_Wrapped;
 		MUCRoomHandlerWrapper* m_HandlerWrapper;
 		bool m_Owned;
 	public:
 		MUCRoom(gloox::MUCRoom* room, bool owned);
 		MUCRoom(Client* parent, const JID& nick, MUCRoomHandler* mrh, MUCRoomConfigHandler* mrch = 0);
 		~MUCRoom();
 		const string nick() const;
 		const string name() const;
 		const string service() const;
 		void join(gloox::Presence::PresenceType type = gloox::Presence::Available, const string& status = "", int priority = 0);
 		void leave(const string& msg = "");
 		void send(const string& message);
 		void setNick(const string& nick);
 		void setPresence(gloox::Presence::PresenceType presence, const string& msg = "");
 		void setRequestHistory(int value, gloox::MUCRoom::HistoryRequestType type);
 		void kick(const string& nick, const string& reason);
 		void ban(const string& nick, const string& reason);
 	};
 
 	class GLOOXWRAPPER_API Presence
 	{
 		gloox::Presence::PresenceType m_Presence;
 	public:
 		Presence(gloox::Presence::PresenceType presence) : m_Presence(presence) {}
 		gloox::Presence::PresenceType presence() const { return m_Presence; }
 	};
 
 	class GLOOXWRAPPER_API Registration
 	{
 		NONCOPYABLE(Registration);
 	private:
 		gloox::Registration* m_Wrapped;
 		std::list<shared_ptr<gloox::RegistrationHandler> > m_RegistrationHandlers;
 	public:
 		Registration(Client* parent);
 		~Registration();
 		void fetchRegistrationFields();
 		bool createAccount(int fields, const RegistrationFields& values);
 		void registerRegistrationHandler(RegistrationHandler* rh);
 	};
 
 	class GLOOXWRAPPER_API Tag
 	{
 		NONCOPYABLE(Tag);
 	private:
 		gloox::Tag* m_Wrapped;
 		bool m_Owned;
 
 		Tag(const string& name);
 		Tag(const string& name, const string& cdata);
 		Tag(gloox::Tag* wrapped, bool owned) : m_Wrapped(wrapped), m_Owned(owned) {}
 		~Tag();
 
 	public:
 		// Internal use:
 		gloox::Tag* getWrapped() { return m_Wrapped; }
 		gloox::Tag* stealWrapped() { m_Owned = false; return m_Wrapped; }
 		static Tag* allocate(gloox::Tag* wrapped, bool owned);
 
 		// Instead of using new/delete, Tags must be allocated/freed with these functions
 		static Tag* allocate(const string& name);
 		static Tag* allocate(const string& name, const string& cdata);
 		static void free(const Tag* tag);
 
 		bool addAttribute(const string& name, const string& value);
 		string findAttribute(const string& name) const;
 		Tag* clone() const;
 		string xmlns() const;
 		bool setXmlns(const string& xmlns);
 		string xml() const;
 		void addChild(Tag* child);
 		string name() const;
 		string cdata() const;
 		const Tag* findTag_clone(const string& expression) const; // like findTag but must be Tag::free()d
 		ConstTagList findTagList_clone(const string& expression) const; // like findTagList but each tag must be Tag::free()d
 	};
 
 	/**
 	 * See XEP-0166: Jingle and https://camaya.net/api/gloox/namespacegloox_1_1Jingle.html.
 	 */
 	namespace Jingle
 	{
 
 		class GLOOXWRAPPER_API Plugin
 		{
 		protected:
 			const gloox::Jingle::Plugin* m_Wrapped;
 			bool m_Owned;
 
 		public:
 			Plugin(const gloox::Jingle::Plugin* wrapped, bool owned) : m_Wrapped(wrapped), m_Owned(owned) {}
 
 			virtual ~Plugin();
 
 			const Plugin findPlugin(int type) const;
 			const gloox::Jingle::Plugin* getWrapped() const { return m_Wrapped; }
 		};
 
 		typedef list<const Plugin*> PluginList;
 
 		/**
 		 * See XEP-0176: Jingle ICE-UDP Transport Method
 		 */
 		class GLOOXWRAPPER_API ICEUDP
 		{
 		public:
 			struct Candidate {
 				string ip;
 				int port;
 			};
 		private:
 			// Class not implemented as it is not used.
 			ICEUDP() = delete;
 		};
 
 		class GLOOXWRAPPER_API Session
 		{
 		protected:
 			gloox::Jingle::Session* m_Wrapped;
 			bool m_Owned;
 
 		public:
 			class GLOOXWRAPPER_API Jingle
 			{
 			private:
 				const gloox::Jingle::Session::Jingle* m_Wrapped;
 				bool m_Owned;
 			public:
 				Jingle(const gloox::Jingle::Session::Jingle* wrapped, bool owned) : m_Wrapped(wrapped), m_Owned(owned) {}
 				~Jingle()
 				{
 					if (m_Owned)
 						delete m_Wrapped;
 				}
 				ICEUDP::Candidate getCandidate() const;
 			};
 
 			Session(gloox::Jingle::Session* wrapped, bool owned);
 			~Session();
 
 			bool sessionInitiate(char* ipStr, uint16_t port);
 		};
 
 		class GLOOXWRAPPER_API SessionHandler
 		{
 		public:
 			virtual ~SessionHandler() {}
 			virtual void handleSessionAction(gloox::Jingle::Action action, Session& session, const Session::Jingle& jingle) = 0;
 		};
 
 	}
 
 	class GLOOXWRAPPER_API SessionManager
 	{
 	private:
 		gloox::Jingle::SessionManager* m_Wrapped;
 		SessionHandlerWrapper* m_HandlerWrapper;
 
 	public:
 		SessionManager(Client* parent, Jingle::SessionHandler* sh);
 		~SessionManager();
 		void registerPlugins();
 		Jingle::Session createSession(const JID& callee);
 	};
 
 }
 
 #endif // INCLUDED_GLOOXWRAPPER_H