From eb8c95f1924f0dde3c5ad97c2dc398e7bd5ced30 Mon Sep 17 00:00:00 2001
From: Gaelle Braud <gaelle.braud@belledonne-communications.com>
Date: Thu, 2 Jan 2025 09:55:59 +0100
Subject: [PATCH] fix

---
 Linphone/view/Control/Container/Call/CallHistoryLayout.qml  | 2 +-
 Linphone/view/Control/Container/Call/CallLayout.qml         | 2 +-
 Linphone/view/Control/Display/Call/CallListView.qml         | 2 +-
 Linphone/view/Control/Display/Contact/Avatar.qml            | 6 +++---
 .../Control/Popup/Notification/NotificationReceivedCall.qml | 2 +-
 Linphone/view/Page/Main/Call/CallPage.qml                   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml
index 6f866d12..3f285a1f 100644
--- a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml
+++ b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml
@@ -73,7 +73,7 @@ ColumnLayout {
 				width: 100 * DefaultStyle.dp
 				height: 100 * DefaultStyle.dp
 				contact: mainItem.contact || null
-				isConferenceInfo: mainItem.conferenceInfo
+				isConference: !!mainItem.conferenceInfo
 				_address: mainItem.conferenceInfo
 					? mainItem.conferenceInfo.core.subject
 					: mainItem.contactAddress || mainItem.contactName
diff --git a/Linphone/view/Control/Container/Call/CallLayout.qml b/Linphone/view/Control/Container/Call/CallLayout.qml
index b12fc272..0dc1f7be 100644
--- a/Linphone/view/Control/Container/Call/CallLayout.qml
+++ b/Linphone/view/Control/Container/Call/CallLayout.qml
@@ -16,7 +16,7 @@ Item {
 	property bool callTerminatedByUser: false
 	property bool callStarted: call?.core.isStarted
 	readonly property var callState: call? call.core.state : undefined
-	property int conferenceLayout: call && call.core.conferenceVideoLayout || LinphoneEnums.ConferenceLayout.ActiveSpeaker
+	property int conferenceLayout: call ? call.core.conferenceVideoLayout : LinphoneEnums.ConferenceLayout.ActiveSpeaker
 	// property int participantDeviceCount: conference ? conference.core.participantDeviceCount : -1
 	// onParticipantDeviceCountChanged: {
 		// setConferenceLayout()
diff --git a/Linphone/view/Control/Display/Call/CallListView.qml b/Linphone/view/Control/Display/Call/CallListView.qml
index 6cbcb846..43d86753 100644
--- a/Linphone/view/Control/Display/Call/CallListView.qml
+++ b/Linphone/view/Control/Display/Call/CallListView.qml
@@ -31,7 +31,7 @@ ListView {
 			Layout.preferredWidth: 45 * DefaultStyle.dp
 			Layout.preferredHeight: 45 * DefaultStyle.dp
 			_address: modelData.core.remoteAddress
-			isConferenceInfo: modelData.core.isConference
+			isConference: modelData.core.isConference
 		}
 		ColumnLayout {
 			spacing: 0
diff --git a/Linphone/view/Control/Display/Contact/Avatar.qml b/Linphone/view/Control/Display/Contact/Avatar.qml
index 74b2bc26..cc46b120 100644
--- a/Linphone/view/Control/Display/Contact/Avatar.qml
+++ b/Linphone/view/Control/Display/Contact/Avatar.qml
@@ -15,7 +15,7 @@ Loader{
 	property AccountGui account: null
 	property FriendGui contact: null
 	property CallGui call: null
-	property bool isConferenceInfo: false
+	property bool isConference: false
 	property string _address: account
 		? account.core?.identityAddress || ""
 		: call
@@ -144,7 +144,7 @@ Loader{
 						width: height
 						Rectangle {
 							id: initialItem
-							property string initials: mainItem.isConferenceInfo ? "" : UtilsCpp.getInitials(mainItem.displayNameVal)
+							property string initials: mainItem.isConference ? "" : UtilsCpp.getInitials(mainItem.displayNameVal)
 							radius: width / 2
 							color: DefaultStyle.main2_200
 							height: stackView.height
@@ -166,7 +166,7 @@ Loader{
 								visible: initialItem.initials == ''
 								width: stackView.width/2
 								height: width
-								source: mainItem.isConferenceInfo ? AppIcons.usersThree : AppIcons.profile
+								source: mainItem.isConference ? AppIcons.usersThree : AppIcons.profile
 								sourceSize.width: width
 								sourceSize.height: height
 								anchors.centerIn: parent
diff --git a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
index 58ebb5e9..aceedc47 100644
--- a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
+++ b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
@@ -64,7 +64,7 @@ Notification {
 						Layout.preferredHeight: 60 * DefaultStyle.dp
 						Layout.alignment: Qt.AlignHCenter
 						call: mainItem.call
-						isConferenceInfo: mainItem.call && mainItem.call.core.isConference
+						isConference: mainItem.call && mainItem.call.core.isConference
 					}
 					ColumnLayout {
 						spacing: 0
diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml
index a104bf2d..7f915dc1 100644
--- a/Linphone/view/Page/Main/Call/CallPage.qml
+++ b/Linphone/view/Page/Main/Call/CallPage.qml
@@ -305,7 +305,7 @@ AbstractMainPage {
 												_address: modelData.core.remoteAddress
 												width: 45 * DefaultStyle.dp
 												height: 45 * DefaultStyle.dp
-												isConferenceInfo: modelData.core.isConference
+												isConference: modelData.core.isConference
 											}
 											ColumnLayout {
 												Layout.fillHeight: true