Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: remove redundant key checks in KFileItemActions::addServiceActionsTo()

Browse source 
neither X-KDE-ShowIfRunning nor X-KDE-ShowIfDBusCall is used, not
registered properties either

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-27 21:50:38 +03:00
parent 98b927aef3
commit 4f2ec79294
1 changed files with 2 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
kio/kio/kfileitemactions.cpp
View file

@ -245,35 +245,6 @@ int KFileItemActions::addServiceActionsTo(QMenu* mainMenu)
KDesktopFile desktopFile(file);
const KConfigGroup cfg = desktopFile.desktopGroup();
if (cfg.hasKey("X-KDE-ShowIfRunning")) {
const QString app = cfg.readEntry("X-KDE-ShowIfRunning");
if (QDBusConnection::sessionBus().interface()->isServiceRegistered(app)) {
continue;
}
}
if (cfg.hasKey("X-KDE-ShowIfDBusCall")) {
QString calldata = cfg.readEntry("X-KDE-ShowIfDBusCall");
const QStringList parts = calldata.split(' ');
const QString &app = parts.at(0);
const QString &obj = parts.at(1);
QString interface = parts.at(2);
QString method;
int pos = interface.lastIndexOf(QLatin1Char('.'));
if (pos != -1) {
method = interface.mid(pos + 1);
interface.truncate(pos);
}
//if (!QDBus::sessionBus().busService()->nameHasOwner(app))
// continue; //app does not exist so cannot send call
QDBusMessage reply = QDBusInterface(app, obj, interface).
call(method, urlList.toStringList());
if (reply.arguments().count() < 1 || reply.arguments().at(0).type() != QVariant::Bool || !reply.arguments().at(0).toBool()) {
continue;
}
}
if (cfg.hasKey("X-KDE-Protocol")) {
const QString theProtocol = cfg.readEntry("X-KDE-Protocol");
if (theProtocol.startsWith('!')) {
@ -284,14 +255,12 @@ int KFileItemActions::addServiceActionsTo(QMenu* mainMenu)
} else if (protocol != theProtocol) {
continue;
}
}
else if (cfg.hasKey("X-KDE-Protocols")) {
} else if (cfg.hasKey("X-KDE-Protocols")) {
const QStringList protocols = cfg.readEntry("X-KDE-Protocols", QStringList());
if (!protocols.contains(protocol)) {
continue;
}
}
else if (protocol == "trash") {
} else if (protocol == "trash") {
// Require servicemenus for the trash to ask for protocol=trash explicitly.
// Trashed files aren't supposed to be available for actions.
// One might want a servicemenu for trash.desktop itself though.