Commit 34793172 authored by pvuorela's avatar pvuorela

Merge branch 'fix_location_agreements' into 'master'

Fix location agreements

See merge request mer-core/nemo-qml-plugin-systemsettings!131
parents 498d3260 f5f8eca9
Name: nemo-qml-plugin-systemsettings Name: nemo-qml-plugin-systemsettings
Summary: System settings plugin for Nemo Mobile Summary: System settings plugin for Nemo Mobile
Version: 0.5 Version: 0.5.37
Release: 1 Release: 1
Group: System/Libraries Group: System/Libraries
License: BSD License: BSD
......
...@@ -288,9 +288,14 @@ bool LocationSettingsPrivate::updateProvider(const QString &name, const Location ...@@ -288,9 +288,14 @@ bool LocationSettingsPrivate::updateProvider(const QString &name, const Location
m_pendingAgreements.removeOne(name); m_pendingAgreements.removeOne(name);
emit q->pendingAgreementsChanged(); emit q->pendingAgreementsChanged();
} }
} else if (provider.hasAgreement && !provider.agreementAccepted && !m_pendingAgreements.contains(name)) { } else if (provider.hasAgreement) {
m_pendingAgreements.append(name); if (!provider.agreementAccepted && !m_pendingAgreements.contains(name)) {
emit q->pendingAgreementsChanged(); m_pendingAgreements.append(name);
emit q->pendingAgreementsChanged();
} else if (provider.agreementAccepted && m_pendingAgreements.contains(name)) {
m_pendingAgreements.removeOne(name);
emit q->pendingAgreementsChanged();
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment