diff --git a/source/lobby/IXmppClient.h b/source/lobby/IXmppClient.h index 67643178cd..ada9f229a3 100644 --- a/source/lobby/IXmppClient.h +++ b/source/lobby/IXmppClient.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2017 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -31,7 +31,6 @@ public: virtual void connect() = 0; virtual void disconnect() = 0; virtual void recv() = 0; - virtual void SendIqGetGameList() = 0; virtual void SendIqGetBoardList() = 0; virtual void SendIqGetProfile(const std::string& player) = 0; virtual void SendIqGameReport(ScriptInterface& scriptInterface, JS::HandleValue data) = 0; diff --git a/source/lobby/XmppClient.cpp b/source/lobby/XmppClient.cpp index 0b272afc6c..689f3e610b 100644 --- a/source/lobby/XmppClient.cpp +++ b/source/lobby/XmppClient.cpp @@ -252,20 +252,6 @@ void XmppClient::handleMUCError(glooxwrapper::MUCRoom*, gloox::StanzaError err) * Requests to server * *****************************************************/ -/** - * Request a listing of active games from the server. - */ -void XmppClient::SendIqGetGameList() -{ - glooxwrapper::JID xpartamuppJid(m_xpartamuppId); - - // Send IQ - glooxwrapper::IQ iq(gloox::IQ::Get, xpartamuppJid); - iq.addExtension(new GameListQuery()); - DbgXMPP("SendIqGetGameList [" << tag_xml(iq) << "]"); - m_client->send(iq); -} - /** * Request the leaderboard data from the server. */ diff --git a/source/lobby/XmppClient.h b/source/lobby/XmppClient.h index 40b8953e6b..c256d2f527 100644 --- a/source/lobby/XmppClient.h +++ b/source/lobby/XmppClient.h @@ -61,7 +61,6 @@ public: void connect(); void disconnect(); void recv(); - void SendIqGetGameList(); void SendIqGetBoardList(); void SendIqGetProfile(const std::string& player); void SendIqGameReport(ScriptInterface& scriptInterface, JS::HandleValue data); diff --git a/source/lobby/scripting/JSInterface_Lobby.cpp b/source/lobby/scripting/JSInterface_Lobby.cpp index d1525c1da3..689261f267 100644 --- a/source/lobby/scripting/JSInterface_Lobby.cpp +++ b/source/lobby/scripting/JSInterface_Lobby.cpp @@ -39,7 +39,6 @@ void JSI_Lobby::RegisterScriptFunctions(ScriptInterface& scriptInterface) scriptInterface.RegisterFunction("StopXmppClient"); scriptInterface.RegisterFunction("ConnectXmppClient"); scriptInterface.RegisterFunction("DisconnectXmppClient"); - scriptInterface.RegisterFunction("SendGetGameList"); scriptInterface.RegisterFunction("SendGetBoardList"); scriptInterface.RegisterFunction("SendGetProfile"); scriptInterface.RegisterFunction("SendRegisterGame"); @@ -119,13 +118,6 @@ void JSI_Lobby::DisconnectXmppClient(ScriptInterface::CxPrivate* UNUSED(pCxPriva g_XmppClient->disconnect(); } -void JSI_Lobby::SendGetGameList(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) -{ - if (!g_XmppClient) - return; - g_XmppClient->SendIqGetGameList(); -} - void JSI_Lobby::SendGetBoardList(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) { if (!g_XmppClient) diff --git a/source/lobby/scripting/JSInterface_Lobby.h b/source/lobby/scripting/JSInterface_Lobby.h index 0838120721..8c684ac94a 100644 --- a/source/lobby/scripting/JSInterface_Lobby.h +++ b/source/lobby/scripting/JSInterface_Lobby.h @@ -36,7 +36,6 @@ namespace JSI_Lobby void StopXmppClient(ScriptInterface::CxPrivate* pCxPrivate); void ConnectXmppClient(ScriptInterface::CxPrivate* pCxPrivate); void DisconnectXmppClient(ScriptInterface::CxPrivate* pCxPrivate); - void SendGetGameList(ScriptInterface::CxPrivate* pCxPrivate); void SendGetBoardList(ScriptInterface::CxPrivate* pCxPrivate); void SendGetProfile(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& player); void SendGameReport(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue data); diff --git a/source/tools/XpartaMuPP/XpartaMuPP.py b/source/tools/XpartaMuPP/XpartaMuPP.py index 49804898b0..27da145e70 100644 --- a/source/tools/XpartaMuPP/XpartaMuPP.py +++ b/source/tools/XpartaMuPP/XpartaMuPP.py @@ -280,13 +280,7 @@ class XpartaMuPP(sleekxmpp.ClientXMPP): """ # Send lists/register on leaderboard; depreciated once muc_online # can send lists/register automatically on joining the room. - if 'gamelist' in iq.plugins: - try: - self.sendGameList(iq['from']) - except: - traceback.print_exc() - logging.error("Failed to process gamelist request from %s" % iq['from'].bare) - elif 'boardlist' in iq.plugins: + if 'boardlist' in iq.plugins: command = iq['boardlist']['command'] try: self.relayBoardListRequest(iq['from'])