don't test isEnabled, it can be changed for >1 reason

svn path=/trunk/KDE/kdelibs/; revision=1171799
This commit is contained in:
Chani Armitage 2010-09-05 08:03:27 +00:00
parent 54e3837b10
commit 900f8c6318

View File

@ -1210,7 +1210,7 @@ void Applet::flushPendingConstraintsEvents()
connect(configAction, SIGNAL(triggered(bool)), this, SLOT(showConfigurationInterface()), Qt::UniqueConnection); connect(configAction, SIGNAL(triggered(bool)), this, SLOT(showConfigurationInterface()), Qt::UniqueConnection);
} }
if (configAction->isEnabled()) { if (d->hasConfigurationInterface) {
bool canConfig = unlocked || KAuthorized::authorize("plasma/allow_configure_when_locked"); bool canConfig = unlocked || KAuthorized::authorize("plasma/allow_configure_when_locked");
configAction->setVisible(canConfig); configAction->setVisible(canConfig);
configAction->setEnabled(canConfig); configAction->setEnabled(canConfig);
@ -1238,7 +1238,7 @@ void Applet::flushPendingConstraintsEvents()
} }
action = d->actions->action("configure"); action = d->actions->action("configure");
if (action && action->isEnabled()) { if (action && d->hasConfigurationInterface) {
bool canConfig = unlocked || KAuthorized::authorize("plasma/allow_configure_when_locked"); bool canConfig = unlocked || KAuthorized::authorize("plasma/allow_configure_when_locked");
action->setVisible(canConfig); action->setVisible(canConfig);
action->setEnabled(canConfig); action->setEnabled(canConfig);