From 2307c7ba82fb937750dec4722df36a567659338b Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Thu, 19 Aug 2021 17:57:15 +0200
Subject: [PATCH] Windows : Fix special characters in messages + build
 languages

---
 linphone-app/assets/languages/CMakeLists.txt        | 13 +++++++------
 .../src/components/chat-events/ChatMessageModel.cpp |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/linphone-app/assets/languages/CMakeLists.txt b/linphone-app/assets/languages/CMakeLists.txt
index 5e2a6a5ee..ffe2b6a5b 100644
--- a/linphone-app/assets/languages/CMakeLists.txt
+++ b/linphone-app/assets/languages/CMakeLists.txt
@@ -77,10 +77,11 @@ add_custom_target(update_translations
 
 # Remove `*.qm` when `clean` is called.
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${QM_FILES}")
-
+if (WIN32)
 # Workaround: Create empty files for some cmake versions. Otherwise, the qm rules can't be used.
-# foreach (qm ${QM_FILES})
-#   if (NOT EXISTS "${qm}")
-#     file(GENERATE OUTPUT "${qm}" CONTENT "")
-#   endif()
-# endforeach()
+ foreach (qm ${QM_FILES})
+   if (NOT EXISTS "${qm}")
+     file(GENERATE OUTPUT "${qm}" CONTENT "")
+   endif()
+ endforeach()
+endif()
diff --git a/linphone-app/src/components/chat-events/ChatMessageModel.cpp b/linphone-app/src/components/chat-events/ChatMessageModel.cpp
index f8707a90c..5d86af197 100644
--- a/linphone-app/src/components/chat-events/ChatMessageModel.cpp
+++ b/linphone-app/src/components/chat-events/ChatMessageModel.cpp
@@ -332,7 +332,7 @@ ChatMessageModel::ChatMessageModel ( std::shared_ptr<linphone::ChatMessage> chat
 	QString txt;
 	for(auto content : contents){
 		if(content->isText())
-			txt += Utils::coreStringToAppString(content->getUtf8Text());
+			txt += content->getUtf8Text().c_str();
 	}
 	mContent = txt;
 	//mIsOutgoing = chatMessage->isOutgoing() || chatMessage->getState() == linphone::ChatMessage::State::Idle;