Merge branch 'fix_location_agreements' into 'master'

Fix location agreements

See merge request mer-core/nemo-qml-plugin-systemsettings!131

Author: pvuorela

rpm/nemo-qml-plugin-systemsettings.spec

@@ -1,6 +1,6 @@
 Name:       nemo-qml-plugin-systemsettings
 Summary:    System settings plugin for Nemo Mobile
-Version:    0.5
+Version:    0.5.37
 Release:    1
 Group:      System/Libraries
 License:    BSD

src/locationsettings.cpp

@@ -288,9 +288,14 @@ bool LocationSettingsPrivate::updateProvider(const QString &name, const Location
                 m_pendingAgreements.removeOne(name);
                 emit q->pendingAgreementsChanged();
             }
-        } else if (provider.hasAgreement && !provider.agreementAccepted && !m_pendingAgreements.contains(name)) {
-            m_pendingAgreements.append(name);
-            emit q->pendingAgreementsChanged();
+        } else if (provider.hasAgreement) {
+            if (!provider.agreementAccepted && !m_pendingAgreements.contains(name)) {
+                m_pendingAgreements.append(name);
+                emit q->pendingAgreementsChanged();
+            } else if (provider.agreementAccepted && m_pendingAgreements.contains(name)) {
+                m_pendingAgreements.removeOne(name);
+                emit q->pendingAgreementsChanged();
+            }
         }
     }