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

extender items can't return to source if the desktop is locked

Browse Source 
BUG:215230

svn path=/trunk/KDE/kdelibs/; revision=1134489
This commit is contained in:
Marco Martin 2010-06-04 12:40:34 +00:00
parent 637555e477
commit 2729b466df
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extenders/extenderitem.cpp
View File

@ -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 //make sure we keep monitoring if the source applet still exists, so the return to source icon
//can be hidden if it is removed. //can be hidden if it is removed.
connect(d->sourceApplet, SIGNAL(destroyed()), this, SLOT(sourceAppletRemoved())); 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())); connect(d->collapseIcon, SIGNAL(clicked()), this, SLOT(toggleCollapse()));
//set the extender we want to move to. //set the extender we want to move to.
@ -749,7 +750,7 @@ void ExtenderItemPrivate::updateToolBox()
QAction *closeAction = actions.value("close"); QAction *closeAction = actions.value("close");
QAction *returnToSourceAction = actions.value("extenderItemReturnToSource"); QAction *returnToSourceAction = actions.value("extenderItemReturnToSource");
bool returnToSourceVisibility = q->isDetached() && sourceApplet; bool returnToSourceVisibility = q->isDetached() && sourceApplet && (sourceApplet->immutability() == Plasma::Mutable);
int closeIndex = -1; int closeIndex = -1;
int returnToSourceIndex = -1; int returnToSourceIndex = -1;
const int startingIndex = 2; // collapse item is index 0, title label is 1 const int startingIndex = 2; // collapse item is index 0, title label is 1