Merge lp:~mhr3/unity-scopes-shell/fix-1329890 into lp:unity-scopes-shell

[Michal Hruby]

Emit openScope() and gotoScope() also from temp scopes.

Emit openScope() and gotoScope() also from temp scopes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/146/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/43/console

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

review: Needs Fixing (continuous-integration)

[Pete Woods (pete-woods)]

review: Approve

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-07-09 16:22:03 +0000
+++ src/Unity/scope.cpp	2014-07-09 16:22:03 +0000
@@ -79,6 +79,8 @@
     m_settings = QGSettings::isSchemaInstalled("com.canonical.Unity.Lenses") ? new QGSettings("com.canonical.Unity.Lenses", QByteArray(), this) : nullptr;
     QObject::connect(m_settings, &QGSettings::changed, this, &Scope::internetFlagChanged);
 
+    setScopesInstance(qobject_cast<scopes_ng::Scopes*>(parent));
+
     m_aggregatorTimer.setSingleShot(true);
     QObject::connect(&m_aggregatorTimer, &QTimer::timeout, this, &Scope::flushUpdates);
     m_clearTimer.setSingleShot(true);
@@ -206,9 +208,8 @@
 
 void Scope::executeCannedQuery(unity::scopes::CannedQuery const& query, bool allowDelayedActivation)
 {
-    scopes_ng::Scopes* scopes = qobject_cast<scopes_ng::Scopes*>(parent());
-    if (scopes == nullptr) {
-        qWarning("Scope instance %p doesn't have Scopes as a parent", static_cast<void*>(this));
+    if (!m_scopesInstance) {
+        qWarning("Scope instance %p doesn't have associated Scopes instance", static_cast<void*>(this));
         return;
     }
 
@@ -216,7 +217,7 @@
     QString searchString(QString::fromStdString(query.query_string()));
     QString departmentId(QString::fromStdString(query.department_id()));
     // figure out if this scope is already favourited
-    Scope* scope = scopes->getScopeById(scopeId);
+    Scope* scope = m_scopesInstance->getScopeById(scopeId);
     if (scope != nullptr) {
         // TODO: change filters?
         scope->setCurrentDepartmentId(departmentId);
@@ -224,10 +225,11 @@
         Q_EMIT gotoScope(scopeId);
     } else {
         // create temp dash page
-        auto meta_sptr = scopes->getCachedMetadata(scopeId);
+        auto meta_sptr = m_scopesInstance->getCachedMetadata(scopeId);
         if (meta_sptr) {
             scope = new scopes_ng::Scope(this);
             scope->setScopeData(*meta_sptr);
+            scope->setScopesInstance(m_scopesInstance);
             scope->setCurrentDepartmentId(departmentId);
             scope->setSearchQuery(searchString);
             m_tempScopes.insert(scope);
@@ -235,8 +237,7 @@
         } else if (allowDelayedActivation) {
             // request registry refresh to get the missing metadata
             m_delayedActivation = std::make_shared<scopes::ActivationResponse>(query);
-            QObject::connect(scopes, &Scopes::metadataRefreshed, this, &Scope::metadataRefreshed);
-            scopes->refreshScopeMetadata();
+            m_scopesInstance->refreshScopeMetadata();
         } else {
             qWarning("Unable to find scope \"%s\" after metadata refresh", query.scope_id().c_str());
         }
@@ -453,6 +454,18 @@
     }
 }
 
+void Scope::setScopesInstance(Scopes* scopes)
+{
+    if (m_metadataConnection) {
+        QObject::disconnect(m_metadataConnection);
+    }
+
+    m_scopesInstance = scopes;
+    if (m_scopesInstance) {
+        m_metadataConnection = QObject::connect(scopes, &Scopes::metadataRefreshed, this, &Scope::metadataRefreshed);
+    }
+}
+
 void Scope::setSearchInProgress(bool searchInProgress)
 {
     if (m_searchInProgress != searchInProgress) {

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2014-07-09 16:22:03 +0000
+++ src/Unity/scope.h	2014-07-09 16:22:03 +0000
@@ -25,6 +25,7 @@
 #include <QString>
 #include <QTimer>
 #include <QMetaType>
+#include <QMetaObject>
 #include <QPointer>
 #include <QMultiMap>
 #include <QSet>
@@ -48,6 +49,7 @@
 class PushEvent;
 class PreviewStack;
 class SettingsModel;
+class Scopes;
 
 class CollectionController
 {
@@ -159,6 +161,7 @@
     void departmentModelDestroyed(QObject* obj);
 
 private:
+    void setScopesInstance(Scopes*);
     void startTtlTimer();
     void setSearchInProgress(bool searchInProgress);
     void setCurrentDepartmentId(QString const& id);
@@ -201,6 +204,8 @@
     QSet<unity::shell::scopes::ScopeInterface*> m_tempScopes;
     QMultiMap<QString, Department*> m_departmentModels;
     QMap<Department*, QString> m_inverseDepartments;
+    QPointer<Scopes> m_scopesInstance;
+    QMetaObject::Connection m_metadataConnection;
 };
 
 } // namespace scopes_ng