QtDBus: do not wait for reply for AddMatch and RemoveMatch

We can't recover from these functions failing anyway, so don't ask for
an error condition. The D-Bus library will set the no-reply flag under
these conditions.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>

1 files changed, 14 insertions, 24 deletions

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 2e7b052..bc03896 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -2074,30 +2074,20 @@ void QDBusConnectionPrivate::connectSignal(const QString &key, const SignalHook
 
     if (connection) {
         qDBusDebug("Adding rule: %s", hook.matchRule.constData());
-        QDBusErrorInternal error;
-        q_dbus_bus_add_match(connection, hook.matchRule, error);
-        if (!!error) {
-            QDBusError qerror = error;
-            qWarning("QDBusConnectionPrivate::connectSignal: received error from D-Bus server "
-                     "while connecting signal to %s::%s: %s (%s)",
-                     hook.obj->metaObject()->className(),
-                     hook.obj->metaObject()->method(hook.midx).signature(),
-                     qPrintable(qerror.name()), qPrintable(qerror.message()));
-            Q_ASSERT(false);
-        } else {
-            // Successfully connected the signal
-            // Do we need to watch for this name?
-            if (shouldWatchService(hook.service)) {
-                WatchedServicesHash::mapped_type &data = watchedServices[hook.service];
-                if (++data.refcount == 1) {
-                    // we need to watch for this service changing
-                    connectSignal(dbusServiceString(), QString(), dbusInterfaceString(),
-                                  QLatin1String("NameOwnerChanged"), QStringList() << hook.service, QString(),
-                                  this, SLOT(serviceOwnerChangedNoLock(QString,QString,QString)));
-                    data.owner = getNameOwnerNoCache(hook.service);
-                    qDBusDebug() << this << "Watching service" << hook.service << "for owner changes (current owner:"
-                            << data.owner << ")";
-                }
+        q_dbus_bus_add_match(connection, hook.matchRule, NULL);
+
+        // Successfully connected the signal
+        // Do we need to watch for this name?
+        if (shouldWatchService(hook.service)) {
+            WatchedServicesHash::mapped_type &data = watchedServices[hook.service];
+            if (++data.refcount == 1) {
+                // we need to watch for this service changing
+                connectSignal(dbusServiceString(), QString(), dbusInterfaceString(),
+                              QLatin1String("NameOwnerChanged"), QStringList() << hook.service, QString(),
+                              this, SLOT(serviceOwnerChangedNoLock(QString,QString,QString)));
+                data.owner = getNameOwnerNoCache(hook.service);
+                qDBusDebug() << this << "Watching service" << hook.service << "for owner changes (current owner:"
+                             << data.owner << ")";
             }
         }
     }