diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-12-31 21:56:11 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-01-02 02:18:24 (GMT) |
| commit | 06bdf48e9194d73075041efecde5c70a144d6927 (patch) | |
| tree | f53d680768e899ed5430cb871e88d92377a523c1 /src/dbus/qdbusabstractinterface.cpp | |
| parent | 200413f08334574108fdb07efaa7648f90209a8f (diff) | |
| download | Qt-06bdf48e9194d73075041efecde5c70a144d6927.zip Qt-06bdf48e9194d73075041efecde5c70a144d6927.tar.gz Qt-06bdf48e9194d73075041efecde5c70a144d6927.tar.bz2 | |
Remove the need to know the service owner when adding/removing signal rules.
Task-number: QTBUG-5979
Reviewed-By: TrustMe
Diffstat (limited to 'src/dbus/qdbusabstractinterface.cpp')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 994da10..ff0a93e 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -561,13 +561,7 @@ void QDBusAbstractInterface::connectNotify(const char *signal) QDBusConnectionPrivate *conn = d->connectionPrivate(); if (conn) { - // do we know what our owner is? - QString owner; - if (!d->service.isEmpty() && d->currentOwner.isNull()) - owner = QLatin1String(""); - else - owner = d->currentOwner; - conn->connectRelay(d->service, owner, d->path, d->interface, + conn->connectRelay(d->service, d->path, d->interface, this, signal); } } @@ -585,7 +579,7 @@ void QDBusAbstractInterface::disconnectNotify(const char *signal) QDBusConnectionPrivate *conn = d->connectionPrivate(); if (conn) - conn->disconnectRelay(d->service, d->currentOwner, d->path, d->interface, + conn->disconnectRelay(d->service, d->path, d->interface, this, signal); } |