Merge remote-tracking branch 'origin/KDE/4.8' into frameworks

Conflicts:
	CMakeLists.txt
	nepomuk/core/resource.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/utils/utils.cpp

containment.h

@@ -628,6 +628,7 @@ Q_SIGNALS:
         friend class ContainmentPrivate;
         friend class ContainmentActions;
         friend class PopupApplet;
+        friend class View;
         ContainmentPrivate *const d;
 };
 

view.cpp

@@ -28,6 +28,7 @@
 
 #include "corona.h"
 #include "containment.h"
+#include "private/containment_p.h"
 #include "wallpaper.h"
 
 using namespace Plasma;
@@ -342,13 +343,8 @@ Containment *View::swapContainment(Plasma::Containment *existing, const QString
         // load the configuration of the old containment into the new one
         c->restore(newConfig);
         c->updateConstraints(Plasma::StartupCompletedConstraint);
-        c->flushPendingConstraintsEvents();
+        c->d->initApplets();
         emit corona->containmentAdded(c);
-        foreach (Applet *applet, c->applets()) {
-            applet->init();
-            // We have to flush the applet constraints manually
-            applet->flushPendingConstraintsEvents();
-        }
 
         // destroy the old one
         old->destroy(false);