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

kdecore: KAuthorization optimization

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-09-25 20:25:05 +03:00
parent e88c621aa2
commit 13aa8cf0e1
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
kdecore/kernel/kauthorization.cpp
View file

@ -62,17 +62,13 @@ static bool isDBusServiceRegistered(const QString &helper)
return true;
}
static void killDBusService(const QString &helper)
static void killDBusService(const QString &helper, QDBusInterface *kauthorizationinterface)
{
if (!isDBusServiceRegistered(helper)) {
return;
}
QDBusInterface kauthorizationinterface(
helper, QString::fromLatin1("/"), QString::fromLatin1("org.kde.kauthorization"),
QDBusConnection::systemBus()
);
QDBusReply<void> reply = kauthorizationinterface.call(QString::fromLatin1("stop"));
QDBusReply<void> reply = kauthorizationinterface->call(QString::fromLatin1("stop"));
if (!reply.isValid()) {
kWarning() << reply.error().message();
}
@ -121,6 +117,7 @@ void KAuthorizationAdaptor::stop()
qApp->quit();
}
KAuthorization::KAuthorization(QObject *parent)
: QObject(parent)
{
@ -136,11 +133,11 @@ bool KAuthorization::isAuthorized(const QString &helper)
QDBusReply<bool> reply = kauthorizationinterface.call(QString::fromLatin1("ping"));
if (!reply.isValid()) {
kWarning() << reply.error().message();
killDBusService(helper);
killDBusService(helper, &kauthorizationinterface);
return false;
}
const bool result = reply.value();
killDBusService(helper);
killDBusService(helper, &kauthorizationinterface);
return result;
}
@ -153,7 +150,7 @@ int KAuthorization::execute(const QString &helper, const QString &method, const
while (isDBusServiceRegistered(helper)) {
kDebug() << "Waiting for service to unregister" << helper;
QCoreApplication::processEvents();
QThread::msleep(1000);
QThread::msleep(500);
}
QDBusInterface kauthorizationinterface(
@ -167,7 +164,7 @@ int KAuthorization::execute(const QString &helper, const QString &method, const
} else {
result = reply.value();
}
killDBusService(helper);
killDBusService(helper, &kauthorizationinterface);
kDebug() << "Result" << helper << method << result;
return result;
}