KDE/kdebase/workspace/libs/plasma

[Alex Merry]

SVN commit 832059 by alexmerry:

Clear handles when we go immutable.  Also remove an out-of-date TODO.

BUG: 166004

CCMAIL: panel-devel at kde.org
Should be backported.



 M  +7 -2      containment.cpp  


--- trunk/KDE/kdebase/workspace/libs/plasma/containment.cpp #832058:832059
@@ -845,8 +845,6 @@
                 d->handles[applet]->startFading(AppletHandle::FadeIn, he->pos());
             } else {
                 //kDebug() << "generated applet handle";
-                //TODO: there should be a small delay on showing these. they pop up too quickly/easily
-                //      right now
                 AppletHandle *handle = new AppletHandle(this, applet, he->pos());
                 d->handles[applet] = handle;
                 connect(handle, SIGNAL(disappearDone(AppletHandle*)),
@@ -1076,6 +1074,13 @@
         }
     }
 
+    if (q->immutability() != Mutable) {
+        foreach (AppletHandle* handle, handles) {
+            handle->deleteLater();
+        }
+        handles.clear();
+    }
+
     //setLockToolText();
 }