More avatar related utf8 fixes.

src/net/clientthread.h

@@ -121,6 +121,8 @@ protected:
 
 	ClientSenderCallback &GetSenderCallback();
 
+	QtToolsInterface &GetQtToolsInterface();
+
 	void AddPlayerData(boost::shared_ptr<PlayerData> playerData);
 	void RemovePlayerData(unsigned playerId);
 	void ClearPlayerDataList();

src/net/common/clientstate.cpp

@@ -28,6 +28,7 @@
 #include <net/socket_helper.h>
 #include <net/socket_msg.h>
 #include <core/avatarmanager.h>
+#include <qttoolsinterface.h>
 
 #include <game.h>
 #include <playerinterface.h>
@@ -356,7 +357,7 @@ ClientStateStartSession::Process(ClientThread &client)
 	NetPacketInit::Data initData;
 	initData.password = context.GetPassword();
 	initData.playerName = context.GetPlayerName();
-	string avatarFile = context.GetAvatarFile();
+	string avatarFile = client.GetQtToolsInterface().stringFromUtf8(context.GetAvatarFile());
 	initData.showAvatar = false;
 	if (!avatarFile.empty())
 	{
@@ -592,7 +593,7 @@ ClientStateWaitSession::InternalProcess(ClientThread &client, boost::shared_ptr<
 
 		NetPacketList tmpList;
 		int avatarError = client.GetAvatarManager().AvatarFileToNetPackets(
-			client.GetContext().GetAvatarFile(),
+			client.GetQtToolsInterface().stringFromUtf8(client.GetContext().GetAvatarFile()),
 			retrieveAvatarData.requestId,
 			tmpList);
 
@@ -700,7 +701,7 @@ ClientStateWaitGame::InternalProcess(ClientThread &client, boost::shared_ptr<Net
 			{
 				string avatarFile;
 				if (client.GetAvatarManager().GetAvatarFileName(info.avatar, avatarFile))
-					playerData->SetAvatarFile(avatarFile);
+					playerData->SetAvatarFile(client.GetQtToolsInterface().stringToUtf8(avatarFile));
 				else
 					client.RetrieveAvatarIfNeeded(netPlayerData.playerId, info);
 			}

src/net/common/clientthread.cpp

@@ -454,7 +454,7 @@ ClientThread::SetPlayerInfo(unsigned id, const PlayerInfo &info)
 			string avatarFile;
 			if (GetAvatarManager().GetAvatarFileName(info.avatar, avatarFile))
 			{
-				playerData->SetAvatarFile(myQtToolsInterface->stringToUtf8(avatarFile));
+				playerData->SetAvatarFile(GetQtToolsInterface().stringToUtf8(avatarFile));
 			}
 		}
 	}
@@ -561,7 +561,7 @@ ClientThread::CompleteTempAvatarData(unsigned playerId)
 			if (GetAvatarManager().GetAvatarFileName(tmpPlayerInfo.avatar, fileName))
 			{
 				// Dynamically update avatar in GUI.
-				GetGui().setPlayerAvatar(playerId, fileName);
+				GetGui().setPlayerAvatar(playerId, GetQtToolsInterface().stringToUtf8(fileName));
 			}
 		}
 	}
@@ -680,6 +680,13 @@ ClientThread::GetSenderCallback()
 	return *m_senderCallback;
 }
 
+QtToolsInterface &
+ClientThread::GetQtToolsInterface()
+{
+	assert(myQtToolsInterface.get());
+	return *myQtToolsInterface;
+}
+
 void
 ClientThread::AddPlayerData(boost::shared_ptr<PlayerData> playerData)
 {