Merge lp:~stolowski/unity-scopes-shell/delay-registry-change-processing into lp:unity-scopes-shell

[Paweł Stołowski]

Cherry-picked the workaround for delayed processing of scoperegistry changes from RTM.

Cherry-picked the workaround for delayed processing of scoperegistry changes from RTM.

[Marcus Tomlinson (marcustomlinson)]

Wow, looks a little simpler than the unity-scopes-api version of this fix! +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/355/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/355/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2015-02-25 14:27:06 +0000
+++ src/Unity/scopes.cpp	2015-07-06 17:14:27 +0000
@@ -125,6 +125,10 @@
     }
 
     m_overviewScope = OverviewScope::newInstance(this);
+
+    m_registryRefreshTimer.setSingleShot(true);
+    connect(&m_registryRefreshTimer, SIGNAL(timeout()), this, SLOT(scopeRegistryChanged()));
+
     m_locationService.reset(new UbuntuLocationService());
 
     createUserAgentString();
@@ -549,10 +553,7 @@
         invalidateScopeResults("videoaggregator");
     } else if (scopeName == "scopes") {
         // emitted when smart-scopes proxy or scope registry discovers new scopes
-        refreshScopeMetadata();
-        Q_FOREACH(Scope::Ptr scope, m_scopes) {
-            scope->invalidateResults();
-        }
+        m_registryRefreshTimer.start(5000);
         return;
     }
 
@@ -569,6 +570,15 @@
     }
 }
 
+void Scopes::scopeRegistryChanged()
+{
+    qDebug() << "Refreshing scope metadata";
+    refreshScopeMetadata();
+    Q_FOREACH(Scope::Ptr scope, m_scopes) {
+        scope->invalidateResults();
+    }
+}
+
 QVariant Scopes::data(const QModelIndex& index, int role) const
 {
     int row = index.row();

=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2015-02-25 14:16:45 +0000
+++ src/Unity/scopes.h	2015-07-06 17:14:27 +0000
@@ -102,6 +102,7 @@
     void lsbReleaseFinished();
     void completeDiscoveryFinished();
     void purgeScopesToDelete();
+    void scopeRegistryChanged();
 
 private:
     void createUserAgentString();
@@ -125,6 +126,7 @@
     QSharedPointer<LocationService> m_locationService;
     QTimer m_startupQueryTimeout;
     QTimer m_scopesToDeleteTimer;
+    QTimer m_registryRefreshTimer;
 
     unity::scopes::Runtime::SPtr m_scopesRuntime;
     QMap<QString, Scope::Ptr> m_tempScopes;