From 0ecafe8131496166324218800f1fcb2b733b18fa Mon Sep 17 00:00:00 2001
From: Chani Armitage <chanika@gmail.com>
Date: Mon, 17 Aug 2009 22:31:37 +0000
Subject: [PATCH] use trigger for config group

svn path=/trunk/KDE/kdelibs/; revision=1012648
---
 containment.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/containment.cpp b/containment.cpp
index 3bbcae53e..37c6f9516 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -243,7 +243,7 @@ void Containment::init()
         switch (d->type) {
         case DesktopContainment:
             defaults.insert("wheel:Vertical;NoModifier", "switchdesktop");
-            defaults.insert("MiddleButton;NoModifier", "paste");
+            defaults.insert("MidButton;NoModifier", "paste");
             defaults.insert("RightButton;NoModifier", "contextmenu");
             break;
         case PanelContainment:
@@ -615,7 +615,7 @@ void ContainmentPrivate::containmentActions(KMenu &desktopMenu)
         if (!plugin->isInitialized()) {
             KConfigGroup cfg = q->config();
             cfg = KConfigGroup(&cfg, "ActionPlugins");
-            KConfigGroup pluginConfig = KConfigGroup(&cfg, plugin->pluginName());
+            KConfigGroup pluginConfig = KConfigGroup(&cfg, trigger);
             plugin->restore(pluginConfig);
         }
 
@@ -1704,7 +1704,7 @@ void Containment::setContainmentActions(const QString &trigger, const QString &p
         //it already existed, just reload config
         if (plugin->isInitialized()) {
             //FIXME make a truly unique config group
-            KConfigGroup pluginConfig = KConfigGroup(&cfg, pluginName);
+            KConfigGroup pluginConfig = KConfigGroup(&cfg, trigger);
             plugin->restore(pluginConfig);
         }
     } else {
@@ -2256,7 +2256,7 @@ bool ContainmentPrivate::prepareContainmentActions(const QString &trigger, const
     if (!plugin->isInitialized()) {
         KConfigGroup cfg = q->config();
         cfg = KConfigGroup(&cfg, "ActionPlugins");
-        KConfigGroup pluginConfig = KConfigGroup(&cfg, plugin->pluginName());
+        KConfigGroup pluginConfig = KConfigGroup(&cfg, trigger);
         plugin->restore(pluginConfig);
     }