fix loading of containmentactions plugins

src/plasma/containment.cpp

@@ -212,8 +212,7 @@ void Containment::restore(KConfigGroup &group)
         defaultActionsCfg = KConfigGroup(&defaultActionsCfg, "ContainmentActions");
 
         foreach (const QString &key, defaultActionsCfg.keyList()) {
-            //qDebug() << "loading" << key;
-            addContainmentActions(key, cfg.readEntry(key, QString()));
+            addContainmentActions(key, defaultActionsCfg.readEntry(key, QString()));
         }
     }
 

src/plasma/containmentactions.h

@@ -155,12 +155,11 @@ class PLASMA_EXPORT ContainmentActions : public QObject
 /**
  * Register a containmentactions when it is contained in a loadable module
  */
-#define K_EXPORT_PLASMA_CONTAINMENTACTIONS(libname, classname) \
-K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
-K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
 
 #define K_EXPORT_PLASMA_CONTAINMENTACTIONS_WITH_JSON(libname, classname, jsonFile) \
 K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin<classname>();) \
 K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
 
+Q_DECLARE_METATYPE(Plasma::ContainmentActions*)
+
 #endif // PLASMA_CONTAINMENTACTIONS_H

src/plasma/pluginloader.cpp

@@ -377,7 +377,7 @@ ContainmentActions *PluginLoader::loadContainmentActions(Containment *parent, co
 
     if (offers.isEmpty()) {
 #ifndef NDEBUG
-        // qDebug() << "offers is empty for " << name;
+         qDebug() << "offers is empty for " << name;
 #endif
         return 0;
     }

src/shell/qmlpackages/desktop/contents/defaults

@@ -4,14 +4,14 @@ ToolBox=org.kde.desktoptoolbox
 RuntimePlatform=
 
 [Desktop][ContainmentActions]
-Ctrl;LeftButton=org.kde.standardmenu
+RightButton=org.kde.contextmenu
 MiddleButton=org.kde.paste
  
 [Panel]
 Containment=org.kde.panel
 ToolBox=org.kde.paneltoolbox
 [Panel][ContainmentActions]
-Ctrl;LeftButton=org.kde.standardmenu
+RightButton=org.kde.contextmenu
 
 [Theme]
 Theme=default