Fix signals in genericlayout

app/layout/genericlayout.cpp

@@ -793,12 +793,13 @@ void GenericLayout::containmentDestroyed(QObject *cont)
         }
 
         if (view) {
+            int screenId = view->positioner()->currentScreenId();
             view->disconnectSensitiveSignals();
             view->positioner()->slideOutDuringExit(containment->location());
             view->deleteLater();
 
             emit viewEdgeChanged();
-            emit viewsCountChanged();
+            emit viewsCountChanged(screenId);
         }
     }
 }
@@ -827,11 +828,11 @@ void GenericLayout::destroyedChanged(bool destroyed)
     }
 
     if (view) {
-        // FIXME Replace view with screen number
+        int screenId = view->positioner()->currentScreenId();
         emit m_corona->availableScreenRectChangedFrom(view);
         emit m_corona->availableScreenRegionChangedFrom(view);
         emit viewEdgeChanged();
-        emit viewsCountChanged();
+        emit viewsCountChanged(screenId);
     }
 }
 
@@ -857,7 +858,7 @@ void GenericLayout::addView(Plasma::Containment *containment)
 {
     qDebug().noquote() << "Adding View: Called for layout:" << m_layoutName << "with m_containments.size() ::" << m_containments.size();
 
-    if (!containment || !m_corona || !containment->kPackage().isValid()) {
+    if (!containment || !m_corona || !containment->pluginMetaData().isValid()) {
         qWarning() << "Adding View: The requested containment plugin can not be located or loaded";
         return;
     }
@@ -947,7 +948,7 @@ void GenericLayout::addView(Plasma::Containment *containment)
     latteView->show();
     //}
 
-    emit viewsCountChanged();
+    emit viewsCountChanged(latteView->positioner()->currentScreenId());
 }
 
 void GenericLayout::toggleHiddenState(QString viewName, QString screenName, Plasma::Types::Location edge)
@@ -1038,7 +1039,9 @@ bool GenericLayout::initContainments()
         }
     }
     m_hasInitializedContainments = true;
-    emit viewsCountChanged();
+    // FIXME:
+    // We probably need to find some real screenId for this signal here.
+    emit viewsCountChanged(0);
     return true;
 }
 
@@ -1084,9 +1087,9 @@ void GenericLayout::assignToLayout(Latte::View *latteView, QList<Plasma::Contain
 
     if (latteView) {
         latteView->setLayout(this);
+        emit viewsCountChanged(latteView->positioner()->currentScreenId());
     }
 
-    emit viewsCountChanged();
 
     //! sync the original layout file for integrity
     if (m_corona->layoutsManager()->memoryUsage() == MemoryUsage::MultipleLayouts) {
@@ -1568,8 +1571,9 @@ void GenericLayout::updateView(const Latte::Data::View &viewData)
 
     //! complete update circle and inform the others about the changes
     if (viewMustBeDeleted) {
+        int screenId = view->positioner()->currentScreenId();
         emit viewEdgeChanged();
-        emit viewsCountChanged();
+        emit viewsCountChanged(screenId);
     }
 
     syncLatteViewsToScreens();

app/layout/genericlayout.h

@@ -152,7 +152,7 @@ public slots:
 
 signals:
     void activitiesChanged(); // to move at an interface
-    void viewsCountChanged();
+    void viewsCountChanged(int screenId);
     void viewEdgeChanged();
 
     //! used from ConfigView(s) in order to be informed which is one should be shown