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

backport of r1081144:

Browse Source 
make "run associated application" obey security

svn path=/branches/KDE/4.4/kdelibs/; revision=1081145
This commit is contained in:
Chani Armitage 2010-01-27 20:35:52 +00:00
parent 0fa82befaf
commit f77cf8c3e0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applet.cpp
View File

@ -1970,6 +1970,7 @@ void Applet::setAssociatedApplication(const QString &string)
QAction *runAssociatedApplication = d->actions->action("run associated application"); QAction *runAssociatedApplication = d->actions->action("run associated application");
if (runAssociatedApplication) { if (runAssociatedApplication) {
bool valid = AssociatedApplicationManager::self()->appletHasValidAssociatedApplication(this); bool valid = AssociatedApplicationManager::self()->appletHasValidAssociatedApplication(this);
valid = valid && hasAuthorization("LaunchApp"); //obey security!
runAssociatedApplication->setVisible(valid); runAssociatedApplication->setVisible(valid);
runAssociatedApplication->setEnabled(valid); runAssociatedApplication->setEnabled(valid);
} }
@ -1982,6 +1983,7 @@ void Applet::setAssociatedApplicationUrls(const KUrl::List &urls)
QAction *runAssociatedApplication = d->actions->action("run associated application"); QAction *runAssociatedApplication = d->actions->action("run associated application");
if (runAssociatedApplication) { if (runAssociatedApplication) {
bool valid = AssociatedApplicationManager::self()->appletHasValidAssociatedApplication(this); bool valid = AssociatedApplicationManager::self()->appletHasValidAssociatedApplication(this);
valid = valid && hasAuthorization("LaunchApp"); //obey security!
runAssociatedApplication->setVisible(valid); runAssociatedApplication->setVisible(valid);
runAssociatedApplication->setEnabled(valid); runAssociatedApplication->setEnabled(valid);
} }
@ -1999,8 +2001,10 @@ KUrl::List Applet::associatedApplicationUrls() const
void Applet::runAssociatedApplication() void Applet::runAssociatedApplication()
{ {
if (hasAuthorization("LaunchApp")) {
AssociatedApplicationManager::self()->run(this); AssociatedApplicationManager::self()->run(this);
} }
}
bool Applet::hasValidAssociatedApplication() const bool Applet::hasValidAssociatedApplication() const
{ {