Merge lp:~stolowski/unity-scopes-shell/fix-1446499-rtm into lp:unity-scopes-shell/rtm-14.09

[Paweł Stołowski]

Delay change notifications received from scope registry.

Delay change notifications received from scope registry.

[lp:~stolowski/unity-scopes-shell/fix-1446499-rtm]

155. By Paweł Stołowski on 2015-04-30

Compilation fix

[Marcus Tomlinson (marcustomlinson)]

Looks good

review: Approve

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2014-12-16 16:02:34 +0000
+++ src/Unity/scopes.cpp	2015-04-30 15:35:25 +0000
@@ -123,6 +123,9 @@
         QObject::connect(m_dashSettings, &QGSettings::changed, this, &Scopes::dashSettingsChanged);
     }
 
+    m_registryRefreshTimer.setSingleShot(true);
+    connect(&m_registryRefreshTimer, SIGNAL(timeout()), this, SLOT(scopeRegistryChanged()));
+
     m_overviewScope = new OverviewScope(this);
     m_locationService.reset(new UbuntuLocationService());
 
@@ -537,10 +540,7 @@
         invalidateScopeResults("videoaggregator");
     } else if (scopeName == "scopes") {
         // emitted when smart-scopes proxy or scope registry discovers new scopes
-        refreshScopeMetadata();
-        Q_FOREACH(Scope* scope, m_scopes) {
-            scope->invalidateResults();
-        }
+        m_registryRefreshTimer.start(5000);
         return;
     }
 
@@ -562,6 +562,15 @@
     }
 }
 
+void Scopes::scopeRegistryChanged()
+{
+    qDebug() << "Refreshing scope metadata";
+    refreshScopeMetadata();
+    Q_FOREACH(Scope* scope, m_scopes) {
+        scope->invalidateResults();
+    }
+}
+
 QVariant Scopes::data(const QModelIndex& index, int role) const
 {
     Scope* scope = m_scopes.at(index.row());

=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2014-12-16 16:02:34 +0000
+++ src/Unity/scopes.h	2015-04-30 15:35:25 +0000
@@ -92,6 +92,7 @@
     void dpkgFinished();
     void lsbReleaseFinished();
     void completeDiscoveryFinished();
+    void scopeRegistryChanged();
 
 private:
     void createUserAgentString();
@@ -113,6 +114,7 @@
 
     LocationService::Ptr m_locationService;
     QTimer m_startupQueryTimeout;
+    QTimer m_registryRefreshTimer;
 
     unity::scopes::Runtime::SPtr m_scopesRuntime;