summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-11-19 09:01:47 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-11-19 10:53:18 (GMT)
commitdb1cff73726ff12d50139769dc8071f9e9173261 (patch)
treeeb594f118866d456886c9a1191e7ed698755ce33
parente4392c36352c0d78bd374b616527482f50e6ed72 (diff)
downloadQt-db1cff73726ff12d50139769dc8071f9e9173261.zip
Qt-db1cff73726ff12d50139769dc8071f9e9173261.tar.gz
Qt-db1cff73726ff12d50139769dc8071f9e9173261.tar.bz2
Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"
This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188. Task-number: QTBUG-5972
-rw-r--r--src/dbus/qdbusconnection.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index d7088ff..d3aff6d 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1005,6 +1005,9 @@ void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection)
busService = new QDBusConnectionInterface(connection, this);
ref.deref(); // busService has increased the refcounting to us
// avoid cyclic refcounting
+// if (mode != PeerMode)
+ QObject::connect(busService, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
+ this, SIGNAL(serviceOwnerChanged(QString,QString,QString)));
QObject::connect(this, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)),
busService, SIGNAL(callWithCallbackFailed(QDBusError,QDBusMessage)),