Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Make my previous changes support < C++11 and Windows.

Browse Source 
This was SVN commit r14661.
This commit is contained in:
JoshuaJB 2014-01-24 20:31:39 +00:00
parent 3f00d0cc9c
commit 12a691edc2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/lobby/XmppClient.cpp
View File

@ -111,6 +111,8 @@ XmppClient::XmppClient(const std::string& sUsername, const std::string& sPasswor
m_client->registerMessageHandler( this );
m_Subject = "";
// Uncomment to see the raw stanzas
//m_client->getWrapped()->logInstance().registerLogHandler( gloox::LogLevelDebug, gloox::LogAreaAll, this );
@ -768,10 +770,10 @@ void XmppClient::handleMUCParticipantPresence(glooxwrapper::MUCRoom*, const gloo
/**
* Update local cache when subject changes.
*/
void XmppClient::handleMUCSubject(glooxwrapper::MUCRoom*, const std::string& UNUSED(nick), const std::string& subject)
void XmppClient::handleMUCSubject(glooxwrapper::MUCRoom*, const glooxwrapper::string& UNUSED(nick), const glooxwrapper::string& subject)
{
m_Subject = subject;
CreateSimpleMessage("muc", subject, "subject");
m_Subject = subject.to_string();
CreateSimpleMessage("muc", m_Subject, "subject");
}
/**

4
source/lobby/XmppClient.h
View File

@ -86,7 +86,7 @@ protected:
virtual void handleMUCParticipantPresence(glooxwrapper::MUCRoom*, const glooxwrapper::MUCRoomParticipant, const glooxwrapper::Presence&);
virtual void handleMUCError(glooxwrapper::MUCRoom*, gloox::StanzaError);
virtual void handleMUCMessage(glooxwrapper::MUCRoom* room, const glooxwrapper::Message& msg, bool priv);
virtual void handleMUCSubject(glooxwrapper::MUCRoom*, const std::string& nick, const std::string& subject);
virtual void handleMUCSubject(glooxwrapper::MUCRoom*, const glooxwrapper::string& nick, const glooxwrapper::string& subject);
/* MUC handlers not supported by glooxwrapper */
// virtual bool handleMUCRoomCreation(glooxwrapper::MUCRoom*) {return false;}
// virtual void handleMUCInviteDecline(glooxwrapper::MUCRoom*, const glooxwrapper::JID&, const std::string&) {}
@ -147,7 +147,7 @@ private:
/// Queue of messages for the GUI
std::deque<GUIMessage> m_GuiMessageQueue;
/// Current room subject/topic.
std::string m_Subject = "";
std::string m_Subject;
};
#endif // XMPPCLIENT_H

2
source/lobby/glooxwrapper/glooxwrapper.h
View File

@ -340,7 +340,7 @@ namespace glooxwrapper
virtual void handleMUCParticipantPresence(MUCRoom* room, const MUCRoomParticipant participant, const Presence& presence) = 0; // MUCRoom not supported
virtual void handleMUCMessage(MUCRoom* room, const Message& msg, bool priv) = 0; // MUCRoom not supported
virtual void handleMUCError(MUCRoom* room, gloox::StanzaError error) = 0; // MUCRoom not supported
virtual void handleMUCSubject(MUCRoom* room, const std::string& nick, const std::string& subject) = 0; // MUCRoom not supported
virtual void handleMUCSubject(MUCRoom* room, const string& nick, const string& subject) = 0; // MUCRoom not supported
};
class GLOOXWRAPPER_API RegistrationHandler