Ticket #2491: global-XMPP-receive-v2.diff

binaries/data/mods/public/gui/session/session.js

@@ -435 +435 @@
 
     // Clear renamed entities list
     Engine.GuiInterfaceCall("ClearRenamedEntities");
-
-    // If the lobby is running, wake it up every 10 seconds so we stay connected.
-    if (Engine.HasXmppClient() && (Date.now() - lastXmppClientPoll) > 10000)
-    {
-        Engine.RecvXmppClient();
-        lastXmppClientPoll = Date.now();
-    }
 }
 
 function checkPlayerState()

binaries/data/mods/public/gui/lobby/lobby.js

@@ -446 +446 @@
 
 function onTick()
 {
-    // Wake up XmppClient
-    Engine.RecvXmppClient();
-
     updateTimers();
     checkSpamMonitor();
 

binaries/data/mods/public/gui/lobby/prelobby.js

@@ -138 +138 @@
     // The XmppClient has been created, we are waiting
     // to be connected or to receive an error.
 
-    //Wake up XmppClient
-    Engine.RecvXmppClient();
-
     //Receive messages
     while (true)
     {

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -704 +704 @@
             handleNetMessage(message);
         }
     }
-
-    // If the lobby is running, wake it up every 10 seconds so we stay connected.
-    if (Engine.HasXmppClient() && (Date.now() - lastXmppClientPoll) > 10000)
-    {
-        Engine.RecvXmppClient();
-        lastXmppClientPoll = Date.now();
-    }
 }
 
 // Called when user selects number of players

source/lobby/XmppClient.cpp

@@ -22 +22 @@
 #include "lib/utf8.h"
 
 // Debug
-// TODO: Use builtin error/warning/logging functions.
-#include <iostream>
 #include "ps/CLogger.h"
 
 // Gloox

source/lobby/scripting/JSInterface_Lobby.cpp

@@ -80 +80 @@
     g_XmppClient->disconnect();
 }
 
-void JSI_Lobby::RecvXmppClient(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
-{
-    if (!g_XmppClient)
-        return;
-    g_XmppClient->recv();
-}
-
 void JSI_Lobby::SendGetGameList(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
 {
     if (!g_XmppClient)

source/lobby/scripting/JSInterface_Lobby.h

@@ -34 +34 @@
     void StopXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
     void ConnectXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
     void DisconnectXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
-    void RecvXmppClient(ScriptInterface::CxPrivate* pCxPrivate);
     void SendGetGameList(ScriptInterface::CxPrivate* pCxPrivate);
     void SendGetBoardList(ScriptInterface::CxPrivate* pCxPrivate);
     void SendGetRatingList(ScriptInterface::CxPrivate* pCxPrivate);

source/main.cpp

@@ -66 +66 @@
 #include "network/NetClient.h"
 #include "network/NetServer.h"
 #include "network/NetSession.h"
+#include "lobby/IXmppClient.h"
 #include "graphics/Camera.h"
 #include "graphics/GameView.h"
 #include "graphics/TextureManager.h"
@@ -348 +349 @@
     if (g_NetClient)
         g_NetClient->Flush();
 
+    // Keep us connected to any XMPP servers
+    if (g_XmppClient)
+        g_XmppClient->recv();
+
     g_UserReporter.Update();
 
     g_Console->Update(realTimeSinceLastFrame);

source/gui/scripting/ScriptFunctions.cpp

@@ -957 +957 @@
     scriptInterface.RegisterFunction<void, &JSI_Lobby::StopXmppClient>("StopXmppClient");
     scriptInterface.RegisterFunction<void, &JSI_Lobby::ConnectXmppClient>("ConnectXmppClient");
     scriptInterface.RegisterFunction<void, &JSI_Lobby::DisconnectXmppClient>("DisconnectXmppClient");
-    scriptInterface.RegisterFunction<void, &JSI_Lobby::RecvXmppClient>("RecvXmppClient");
     scriptInterface.RegisterFunction<void, &JSI_Lobby::SendGetGameList>("SendGetGameList");
     scriptInterface.RegisterFunction<void, &JSI_Lobby::SendGetBoardList>("SendGetBoardList");
     scriptInterface.RegisterFunction<void, &JSI_Lobby::SendGetRatingList>("SendGetRatingList");