From kde-commits  Wed Apr 30 20:33:56 2014
From: Frederik Gladhorn <frederik.gladhorn () digia ! com>
Date: Wed, 30 Apr 2014 20:33:56 +0000
To: kde-commits
Subject: [libkdeaccessibilityclient] src/qaccessibilityclient: Change dbus timeouts to return much faster
Message-Id: <E1WfbCW-0006mT-62 () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=139889004531191

Git commit 0bbc5b80cdfb56e693258c1eeccadaae9e3d6546 by Frederik Gladhorn.
Committed on 30/04/2014 at 20:30.
Pushed by gladhorn into branch 'master'.

Change dbus timeouts to return much faster

The sync usage of DBus is probably the worst design mistake in this
library, mititage it a bit.

M  +5    -5    src/qaccessibilityclient/registry_p.cpp

http://commits.kde.org/libkdeaccessibilityclient/0bbc5b80cdfb56e693258c1eec=
cadaae9e3d6546

diff --git a/src/qaccessibilityclient/registry_p.cpp b/src/qaccessibilitycl=
ient/registry_p.cpp
index d28bfb0..584685b 100644
--- a/src/qaccessibilityclient/registry_p.cpp
+++ b/src/qaccessibilityclient/registry_p.cpp
@@ -543,7 +543,7 @@ QList<AccessibleObject> RegistryPrivate::children(const=
 AccessibleObject &object
     QDBusMessage message =3D QDBusMessage::createMethodCall (
                 object.d->service, object.d->path, QLatin1String("org.a11y=
.atspi.Accessible"), QLatin1String("GetChildren"));
 =

-    QDBusReply<QSpiObjectReferenceList> reply =3D conn.connection().call(m=
essage);
+    QDBusReply<QSpiObjectReferenceList> reply =3D conn.connection().call(m=
essage, QDBus::Block, 500);
     if (!reply.isValid()) {
         qWarning() << "Could not access children." << reply.error().messag=
e();
         return accs;
@@ -1163,7 +1163,7 @@ QString RegistryPrivate::imageDescription(const Acces=
sibleObject &object) const
 QString RegistryPrivate::imageLocale(const AccessibleObject &object) const
 {
     QDBusMessage message =3D QDBusMessage::createMethodCall(object.d->serv=
ice, object.d->path, QLatin1String("org.a11y.atspi.Image"), QLatin1String("=
ImageLocale"));
-    QDBusReply<QString> reply =3D conn.connection().call(message);
+    QDBusReply<QString> reply =3D conn.connection().call(message, QDBus::B=
lock, 500);
     if (!reply.isValid()) {
         qWarning() << "Could not access imageLocale." << reply.error().mes=
sage();
         return QString();
@@ -1191,7 +1191,7 @@ QVector< QSharedPointer<QAction> > RegistryPrivate::a=
ctions(const AccessibleObje
     QDBusMessage message =3D QDBusMessage::createMethodCall (
                 object.d->service, object.d->path, QLatin1String("org.a11y=
.atspi.Action"), QLatin1String("GetActions"));
 =

-    QDBusReply<QSpiActionArray> reply =3D conn.connection().call(message);
+    QDBusReply<QSpiActionArray> reply =3D conn.connection().call(message, =
QDBus::Block, 500);
     if (!reply.isValid()) {
         qWarning() << "Could not access actions." << reply.error().message=
();
         return QVector< QSharedPointer<QAction> >();
@@ -1230,7 +1230,7 @@ void RegistryPrivate::actionTriggered(const QString &=
action)
     args << index;
     message.setArguments(args);
 =

-    QDBusReply<bool> reply =3D conn.connection().call(message);
+    QDBusReply<bool> reply =3D conn.connection().call(message, QDBus::Bloc=
k, 500);
     if (!reply.isValid()) {
         qWarning() << "Could not execute action=3D" << action << reply.err=
or().message();
         return;
@@ -1253,7 +1253,7 @@ QVariant RegistryPrivate::getProperty(const QString &=
service, const QString &pat
                 service, path, QLatin1String("org.freedesktop.DBus.Propert=
ies"), QLatin1String("Get"));
 =

     message.setArguments(args);
-    QDBusMessage reply =3D conn.connection().call(message);
+    QDBusMessage reply =3D conn.connection().call(message, QDBus::Block, 5=
00);
     if (reply.arguments().isEmpty())
         return QVariant();
 =