data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #LINQT-1862 double conference info on creation (remove unnecessary signal)

Browse source
This commit is contained in:
Gaelle Braud 2025-07-29 14:35:40 +02:00
parent 4f494696d9
commit e90869c781
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Linphone/core/conference/ConferenceInfoCore.cpp
View file

@ -194,15 +194,6 @@ void ConferenceInfoCore::setSelf(QSharedPointer<ConferenceInfoCore> me) {
uri] { uri] {
setConferenceSchedulerState(state); setConferenceSchedulerState(state);
setConferenceInfoState(infoState); setConferenceInfoState(infoState);
if (state == LinphoneEnums::ConferenceSchedulerState::Ready) {
setUri(uri);
mConfInfoModelConnection->invokeToModel([this, uri, infoState] {
if (infoState == LinphoneEnums::ConferenceInfoState::New)
emit CoreModel::getInstance()->conferenceInfoCreated(
mConferenceInfoModel->getConferenceInfo());
});
}
setConferenceSchedulerState(state);
}); });
}); });
mConfInfoModelConnection->makeConnectToModel( mConfInfoModelConnection->makeConnectToModel(

3
Linphone/core/conference/ConferenceInfoList.cpp
View file

@ -99,9 +99,6 @@ void ConferenceInfoList::setSelf(QSharedPointer<ConferenceInfoList> me) {
// conference (which must hidden) // conference (which must hidden)
mCoreModelConnection->makeConnectToModel(&CoreModel::defaultAccountChanged, [this]() { emit lUpdate(true); }); mCoreModelConnection->makeConnectToModel(&CoreModel::defaultAccountChanged, [this]() { emit lUpdate(true); });
mCoreModelConnection->makeConnectToModel(
&CoreModel::conferenceInfoCreated,
[this](const std::shared_ptr<linphone::ConferenceInfo> &confInfo) { addConference(confInfo); });
mCoreModelConnection->makeConnectToModel( mCoreModelConnection->makeConnectToModel(
&CoreModel::conferenceInfoReceived, &CoreModel::conferenceInfoReceived,
[this](const std::shared_ptr<linphone::Core> &core, [this](const std::shared_ptr<linphone::Core> &core,

1
Linphone/model/core/CoreModel.hpp
View file

@ -76,7 +76,6 @@ signals:
void friendRemoved(const std::shared_ptr<linphone::Friend> &f); void friendRemoved(const std::shared_ptr<linphone::Friend> &f);
void friendUpdated(const std::shared_ptr<linphone::Friend> &f); void friendUpdated(const std::shared_ptr<linphone::Friend> &f);
void bearerAccountAdded(); void bearerAccountAdded();
void conferenceInfoCreated(const std::shared_ptr<linphone::ConferenceInfo> &confInfo);
void unreadNotificationsChanged(); void unreadNotificationsChanged();
void requestFetchConfig(QString path); void requestFetchConfig(QString path);
void requestRestart(); void requestRestart();