From 834f73a10123be2d790a0330d007275cac967f2c Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 14 Aug 2013 14:08:18 +0200
Subject: [PATCH] fix loading of containmentactions plugins

---
 src/plasma/containment.cpp                      | 3 +--
 src/plasma/containmentactions.h                 | 5 ++---
 src/plasma/pluginloader.cpp                     | 2 +-
 src/shell/qmlpackages/desktop/contents/defaults | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp
index 8b38a822b..553f37d49 100644
--- a/src/plasma/containment.cpp
+++ b/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()));
         }
     }
 
diff --git a/src/plasma/containmentactions.h b/src/plasma/containmentactions.h
index dd34fa804..ec165b083 100644
--- a/src/plasma/containmentactions.h
+++ b/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
diff --git a/src/plasma/pluginloader.cpp b/src/plasma/pluginloader.cpp
index a1bf557e6..6e35b01e0 100644
--- a/src/plasma/pluginloader.cpp
+++ b/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;
     }
diff --git a/src/shell/qmlpackages/desktop/contents/defaults b/src/shell/qmlpackages/desktop/contents/defaults
index 1708e7882..62587ef9d 100644
--- a/src/shell/qmlpackages/desktop/contents/defaults
+++ b/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