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

data/services/plasma.protocol

@@ -7,6 +7,7 @@ output=none
 
 Icon=plasma
 Description=A protocol for Plasma services
+Description[bg]=Протокол за услуги Plasma
 Description[bs]=Protokol Plazma usluga
 Description[ca]=Un protocol pels serveis del Plasma
 Description[ca@valencia]=Un protocol pels serveis del Plasma

package.cpp

@@ -399,7 +399,11 @@ PackagePrivate::PackagePrivate(const PackageStructure::Ptr st, const QString &p)
           service(0)
 {
     if (structure) {
-        structure->setPath(p);
+        if (p.isEmpty()) {
+            structure->setPath(structure->defaultPackageRoot());
+        } else {
+            structure->setPath(p);
+        }
     }
 
     valid = structure && !structure->path().isEmpty();

packagestructure.cpp

@@ -149,6 +149,10 @@ PackageStructure::Ptr PackageStructure::load(const QString &packageFormat)
     } else if (packageFormat == "Plasma/Theme") {
         structure = Theme::packageStructure();
         structure->d->type = "Plasma/Theme";
+    } else if (packageFormat == "Plasma/Generic") {
+        structure = defaultPackageStructure(GenericComponent);
+        structure->d->type = "Plasma/Generic";
+        structure->setDefaultPackageRoot(KStandardDirs::locate("data", "plasmapackages"));
     }
 
     if (structure) {

plasma.h

@@ -213,7 +213,8 @@ enum ComponentType {
     RunnerComponent = 4,      /**< Plasma::AbstractRunner based plugsin **/
     AnimatorComponent = 8,    /**< Plasma::Animator based plugins **/
     ContainmentComponent = 16,/**< Plasma::Containment based plugins **/
-    WallpaperComponent = 32   /**< Plasma::Wallpaper based plugins **/
+    WallpaperComponent = 32,   /**< Plasma::Wallpaper based plugins **/
+    GenericComponent = 64      /** Generic repositories of files, usually they keep QML files and their assets **/
 };
 Q_DECLARE_FLAGS(ComponentTypes, ComponentType)