Merge remote-tracking branch 'origin/master' into libplasma2

Conflicts:
	plasma/containment.cpp
	plasma/package.cpp
	plasma/packagestructure.cpp
	plasma/private/package_p.h
	plasma/scripting/scriptengine.cpp

applet.cpp

@@ -1620,7 +1620,9 @@ void Applet::unregisterAsDragHandle(QGraphicsItem *item)
     }
 
     if (d->registeredAsDragHandle.remove(item)) {
-        item->removeSceneEventFilter(this);
+        if (item != this) {
+            item->removeSceneEventFilter(this);
+        }
     }
 }
 
@@ -1750,7 +1752,6 @@ bool Applet::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
             break;
         }
 
-        return false;
     }
 
     switch (event->type()) {
@@ -2346,11 +2347,15 @@ QVariant Applet::itemChange(GraphicsItemChange change, const QVariant &value)
         break;
     case ItemParentHasChanged:
         {
-            Containment *c = containment();
-            if (c && c->containmentType() == Containment::DesktopContainment) {
-                installSceneEventFilter(this);
-            } else {
+            if (isContainment()) {
                 removeSceneEventFilter(this);
+            } else {
+                Containment *c = containment();
+                if (c && c->containmentType() == Containment::DesktopContainment) {
+                    installSceneEventFilter(this);
+                } else {
+                    removeSceneEventFilter(this);
+                }
             }
         }
         break;

data/services/plasma.protocol

@@ -17,6 +17,7 @@ Description[de]=Ein Protokoll für Plasma-Dienste
 Description[el]=Ένα πρωτόκολλο υπηρεσιών Plasma
 Description[es]=Un protocolo para los servicios de Plasma
 Description[et]=Plasma teenuste protokoll
+Description[fi]=Plasma-palvelujen protokolla
 Description[hr]=Protokol za servise u Plasmi
 Description[hu]=Protokoll a Plazma-szolgáltatáshoz
 Description[ia]=un protocollo per servicios de Plasma

private/wallpaperrenderthread_p.h

@@ -78,5 +78,5 @@ private:
 
 } // namespace Plasma
 
-Q_DECLARE_METATYPE(Plasma::WallpaperRenderRequest);
+Q_DECLARE_METATYPE(Plasma::WallpaperRenderRequest)
 #endif // PLASMA_WALLPAPERRENDERTHREAD_P_H