mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix display name with anonymous.

Browse source 
Remove cmake error with minimal version.
This commit is contained in:
Julien Wadel 2025-10-09 11:59:17 +02:00
parent 008b541e29
commit 58a1f75380
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
linphone-app/cmake_builder/linphone_package/CMakeLists.txt
View file

@ -20,7 +20,6 @@
#
################################################################################
cmake_minimum_required(VERSION 3.1)
project(LINPHONE_PACKAGE) # Dummy project.
if(ENABLE_BUILD_VERBOSE)
message("Linphone-packages paths : ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}")

5
linphone-app/src/components/participant/ParticipantDeviceModel.cpp
View file

@ -77,7 +77,10 @@ QString ParticipantDeviceModel::getName() const{
}
QString ParticipantDeviceModel::getDisplayName() const{
return mParticipantDevice ? Utils::getDisplayName(mParticipantDevice->getAddress()) : "";
auto name = mParticipantDevice ? Utils::getDisplayName(mParticipantDevice->getAddress()) : "";
if(name.isEmpty())
name = mParticipantDevice ? Utils::coreStringToAppString(mParticipantDevice->getName().c_str()) : "";
return name;
}
int ParticipantDeviceModel::getSecurityLevel() const{

8
linphone-app/ui/modules/Linphone/Calls/IncallAvatar.qml
View file

@ -25,9 +25,11 @@ Avatar {
: null
property var _username: conferenceInfoModel
? conferenceInfoModel.subject
: _sipAddressObserver
? UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress)
: ''
: participantDeviceModel
? participantDeviceModel.displayName
: _sipAddressObserver
? UtilsCpp.getDisplayName(_sipAddressObserver.peerAddress)
: ''
property bool isPaused: (call && (call.status === CallModel.CallStatusPaused)) || (participantDeviceModel && participantDeviceModel.isPaused) || false
Component.onDestruction: _sipAddressObserver=null// Need to set it to null because of not calling destructor if not.