From fa1fc26241df8a2cf3b88c1d26dc993e343db3e0 Mon Sep 17 00:00:00 2001
From: Itms <itms@wildfiregames.com>
Date: Thu, 26 Jan 2023 15:43:42 +0000
Subject: [PATCH] Upgrade gloox to the development trunk version on Windows,
 refs #3004. This commit needs a rebuild of the glooxwrapper.

This fixes #4705: the TLS connection now works on Windows, also tested
with certificate verification and with TLSv1.2 (so TLSv1.0 can now be
disabled server-side).

Ideally we should have waited for the release of version 1.0.25, but the
development seems to have mostly stopped upstream.

Tested By: maroder
Differential Revision: https://code.wildfiregames.com/D4910
This was SVN commit r27490.
---
 source/lobby/glooxwrapper/glooxwrapper.cpp | 8 +++++++-
 source/lobby/glooxwrapper/glooxwrapper.h   | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/source/lobby/glooxwrapper/glooxwrapper.cpp b/source/lobby/glooxwrapper/glooxwrapper.cpp
index f7ad6e74d3..8c42c4d9e5 100644
--- a/source/lobby/glooxwrapper/glooxwrapper.cpp
+++ b/source/lobby/glooxwrapper/glooxwrapper.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2023 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -209,7 +209,11 @@ public:
 		m_Wrapped->handleAlreadyRegistered(fromWrapped);
 	}
 
+#if OS_WIN
+	virtual void handleRegistrationResult(const gloox::JID& from, gloox::RegistrationResult regResult, const gloox::Error* UNUSED(error))
+#else
 	virtual void handleRegistrationResult(const gloox::JID& from, gloox::RegistrationResult regResult)
+#endif
 	{
 		glooxwrapper::JID fromWrapped(from);
 		m_Wrapped->handleRegistrationResult(fromWrapped, regResult);
@@ -691,8 +695,10 @@ bool glooxwrapper::Registration::createAccount(int fields, const glooxwrapper::R
 	COPY(phone);
 	COPY(url);
 	COPY(date);
+#if !OS_WIN
 	COPY(misc);
 	COPY(text);
+#endif
 #undef COPY
 	return m_Wrapped->createAccount(fields, valuesUnwrapped);
 }
diff --git a/source/lobby/glooxwrapper/glooxwrapper.h b/source/lobby/glooxwrapper/glooxwrapper.h
index 0e03e1d656..7b5abdaeeb 100644
--- a/source/lobby/glooxwrapper/glooxwrapper.h
+++ b/source/lobby/glooxwrapper/glooxwrapper.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 2023 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -320,8 +320,10 @@ namespace glooxwrapper
 		string phone;
 		string url;
 		string date;
+#if !OS_WIN
 		string misc;
 		string text;
+#endif
 	};
 
 	struct MUCRoomParticipant