only do containment-style removal if it's *really* a containment
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=810132
This commit is contained in:
parent
ccde7ded20
commit
18a50b787d
@ -933,12 +933,16 @@ void Containment::destroy()
|
|||||||
if (immutability() != Mutable) {
|
if (immutability() != Mutable) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (isContainment()) {
|
||||||
//FIXME maybe that %1 should be the containment type not the name
|
//FIXME maybe that %1 should be the containment type not the name
|
||||||
if (KMessageBox::warningContinueCancel(0, i18n("Do you really want to remove this %1?", name()),
|
if (KMessageBox::warningContinueCancel(0, i18n("Do you really want to remove this %1?", name()),
|
||||||
i18n("Remove %1", name()), KStandardGuiItem::remove()) == KMessageBox::Continue ) {
|
i18n("Remove %1", name()), KStandardGuiItem::remove()) == KMessageBox::Continue ) {
|
||||||
clearApplets();
|
clearApplets();
|
||||||
corona()->destroyContainment(this);
|
corona()->destroyContainment(this);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
Applet::destroy();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user