alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aaron Seigo 2011-05-28 00:34:50 +02:00
commit 9f3a67df08
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
containment.cpp
View File

@ -510,12 +510,6 @@ void Containment::setContainmentType(Containment::Type type)
return; return;
} }
if (type != DesktopContainment) {
foreach (Plasma::Applet *applet, applets()) {
applet->removeSceneEventFilter(this);
}
}
delete d->toolBox.data(); delete d->toolBox.data();
d->type = type; d->type = type;
d->checkContainmentFurniture(); d->checkContainmentFurniture();
@ -884,7 +878,6 @@ void Containment::addApplet(Applet *applet, const QPointF &pos, bool delayInit)
} }
disconnect(applet, 0, currentContainment, 0); disconnect(applet, 0, currentContainment, 0);
applet->removeSceneEventFilter(currentContainment);
KConfigGroup oldConfig = applet->config(); KConfigGroup oldConfig = applet->config();
currentContainment->d->applets.removeAll(applet); currentContainment->d->applets.removeAll(applet);
applet->setParentItem(this); applet->setParentItem(this);