From 2729b466dfb60e2324ec466a1397dbd74039c5a1 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 4 Jun 2010 12:40:34 +0000 Subject: [PATCH] extender items can't return to source if the desktop is locked BUG:215230 svn path=/trunk/KDE/kdelibs/; revision=1134489 --- extenders/extenderitem.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extenders/extenderitem.cpp b/extenders/extenderitem.cpp index 53fa97d02..d12380404 100644 --- a/extenders/extenderitem.cpp +++ b/extenders/extenderitem.cpp @@ -185,6 +185,7 @@ ExtenderItem::ExtenderItem(Extender *hostExtender, uint extenderItemId) //make sure we keep monitoring if the source applet still exists, so the return to source icon //can be hidden if it is removed. connect(d->sourceApplet, SIGNAL(destroyed()), this, SLOT(sourceAppletRemoved())); + connect(d->sourceApplet, SIGNAL(immutabilityChanged(Plasma::ImmutabilityType)), this, SLOT(updateToolBox())); connect(d->collapseIcon, SIGNAL(clicked()), this, SLOT(toggleCollapse())); //set the extender we want to move to. @@ -749,7 +750,7 @@ void ExtenderItemPrivate::updateToolBox() QAction *closeAction = actions.value("close"); QAction *returnToSourceAction = actions.value("extenderItemReturnToSource"); - bool returnToSourceVisibility = q->isDetached() && sourceApplet; + bool returnToSourceVisibility = q->isDetached() && sourceApplet && (sourceApplet->immutability() == Plasma::Mutable); int closeIndex = -1; int returnToSourceIndex = -1; const int startingIndex = 2; // collapse item is index 0, title label is 1