diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp index c2f1c7b5c..48c233abf 100644 --- a/src/plasma/corona.cpp +++ b/src/plasma/corona.cpp @@ -172,7 +172,15 @@ void Corona::requireConfigSync() void Corona::initializeLayout(const QString &configName) { - clearContainments(); + { + QList containments = d->containments; + d->containments.clear(); + foreach (Containment *containment, containments) { + disconnect(containment, 0, this, 0); + containment->destroy(); + } + } + loadLayout(configName); if (d->containments.isEmpty()) { @@ -244,13 +252,6 @@ QList Corona::containments() const return d->containments; } -void Corona::clearContainments() -{ - foreach (Containment *containment, d->containments) { - containment->clearApplets(); - } -} - KSharedConfigPtr Corona::config() const { if (!d->config) { diff --git a/src/plasma/corona.h b/src/plasma/corona.h index af93ef47f..96e04275e 100644 --- a/src/plasma/corona.h +++ b/src/plasma/corona.h @@ -84,11 +84,6 @@ public: */ QList containments() const; - /** - * Clear the CoronaBase from all applets. - */ - void clearContainments(); - /** * Returns the config file used to store the configuration for this CoronaBase */