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

fix magic search source

Browse source
This commit is contained in:
Gaelle Braud 2024-09-30 12:07:38 +02:00
parent b413301e70
commit 651ddd35d5
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Linphone/core/search/MagicSearchList.cpp
View file

@ -82,6 +82,12 @@ void MagicSearchList::setSelf(QSharedPointer<MagicSearchList> me) {
mModelConnection->makeConnectToCore(&MagicSearchList::lSetSourceFlags, [this](int flags) { mModelConnection->makeConnectToCore(&MagicSearchList::lSetSourceFlags, [this](int flags) {
mModelConnection->invokeToModel([this, flags]() { mMagicSearch->setSourceFlags(flags); }); mModelConnection->invokeToModel([this, flags]() { mMagicSearch->setSourceFlags(flags); });
}); });
mModelConnection->makeConnectToCore(&MagicSearchList::lSetAggregationFlag,
[this](LinphoneEnums::MagicSearchAggregation aggregation) {
mModelConnection->invokeToModel([this, aggregation]() {
mMagicSearch->setAggregationFlag(aggregation);
});
});
mModelConnection->makeConnectToCore( mModelConnection->makeConnectToCore(
&MagicSearchList::lSetAggregationFlag, [this](LinphoneEnums::MagicSearchAggregation flag) { &MagicSearchList::lSetAggregationFlag, [this](LinphoneEnums::MagicSearchAggregation flag) {
mModelConnection->invokeToModel([this, flag]() { mMagicSearch->setAggregationFlag(flag); }); mModelConnection->invokeToModel([this, flag]() { mMagicSearch->setAggregationFlag(flag); });

4
Linphone/view/Control/Display/Contact/ContactListView.qml
View file

@ -35,7 +35,7 @@ ListView {
property string searchBarText property string searchBarText
property string searchText: searchBarText.length === 0 ? "*" : searchBarText property string searchText: searchBarText.length === 0 ? "*" : searchBarText
property var aggregationFlag: LinphoneEnums.MagicSearchAggregation.Friend property var aggregationFlag: LinphoneEnums.MagicSearchAggregation.Friend
property var sourceFlags: LinphoneEnums.MagicSearchSource.Friends | LinphoneEnums.MagicSearchSource.LdapServers property var sourceFlags: LinphoneEnums.MagicSearchSource.Friends | ((searchText.length > 0 && searchText != "*") || SettingsCpp.syncLdapContacts ? LinphoneEnums.MagicSearchSource.LdapServers : 0)
property ConferenceInfoGui confInfoGui property ConferenceInfoGui confInfoGui
@ -98,7 +98,7 @@ ListView {
} }
aggregationFlag: mainItem.aggregationFlag aggregationFlag: mainItem.aggregationFlag
parentProxy: mainItem.listProxy parentProxy: mainItem.listProxy
sourceFlags: LinphoneEnums.MagicSearchSource.Friends | ((mainItem.searchText.length > 0 && mainItem.searchText != "*") || SettingsCpp.syncLdapContacts ? LinphoneEnums.MagicSearchSource.LdapServers : 0) sourceFlags: mainItem.sourceFlags
onInitialized: { onInitialized: {
magicSearchProxy.forceUpdate() magicSearchProxy.forceUpdate()
} }