diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-05 01:58:29 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-05 01:58:29 (GMT) |
| commit | 56d5cac2f2bbee9e4e1ee6ac6ac9670926bb329f (patch) | |
| tree | 4533403537769121558dec29414ffcedb1103abc /src/dbus/qdbusconnection.cpp | |
| parent | 186cdd1c29f1c708455ec2f0771a6eb600d4a075 (diff) | |
| parent | 4c486619517cea4012a157995bce197c817d83e5 (diff) | |
| download | Qt-56d5cac2f2bbee9e4e1ee6ac6ac9670926bb329f.zip Qt-56d5cac2f2bbee9e4e1ee6ac6ac9670926bb329f.tar.gz Qt-56d5cac2f2bbee9e4e1ee6ac6ac9670926bb329f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/dbus/qdbusconnection.cpp')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index d7088ff..47893cc 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -619,10 +619,8 @@ bool QDBusConnection::connect(const QString &service, const QString &path, const if (interface.isEmpty() && name.isEmpty()) return false; - QString owner = d->getNameOwner(service); // we don't care if the owner is empty - // it might get started later QDBusWriteLocker locker(ConnectAction, d); - return d->connectSignal(service, owner, path, interface, name, argumentMatch, signature, receiver, slot); + return d->connectSignal(service, path, interface, name, argumentMatch, signature, receiver, slot); } /*! |