connect even if the action is initially disabled

svn path=/trunk/KDE/kdelibs/; revision=1100978
This commit is contained in:
Aaron J. Seigo 2010-03-09 05:15:13 +00:00
parent 0aebf5936c
commit 01b3fd2286

View File

@ -1171,16 +1171,18 @@ void Applet::flushPendingConstraintsEvents()
}
QAction *configAction = d->actions->action("configure");
if (configAction && configAction->isEnabled()) {
if (configAction) {
if (d->isContainment) {
connect(configAction, SIGNAL(triggered(bool)), this, SLOT(requestConfiguration()), Qt::UniqueConnection);
} else {
connect(configAction, SIGNAL(triggered(bool)), this, SLOT(showConfigurationInterface()), Qt::UniqueConnection);
}
bool canConfig = unlocked || KAuthorized::authorize("plasma/allow_configure_when_locked");
configAction->setVisible(canConfig);
configAction->setEnabled(canConfig);
if (configAction->isEnabled()) {
bool canConfig = unlocked || KAuthorized::authorize("plasma/allow_configure_when_locked");
configAction->setVisible(canConfig);
configAction->setEnabled(canConfig);
}
}
QAction *runAssociatedApplication = d->actions->action("run associated application");