diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-30 17:54:14 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-15 02:08:51 +0000 |
| commit | d8148edb2318a0cd57ac704c105960728461a19a (patch) | |
| tree | 9a35a3b2e0a19002a554271eace37bba92ab1d4f /src/dbus | |
| parent | f744aece9df792fdc63593b5bd749ad69dfbd9c1 (diff) | |
Use the new QDBusConnectionPrivate::shouldWatchService function
That function was added in the previous commit, so deduplicate the code
from QDBusAbstractInterfacePrivate::initOwnerTracking().
Change-Id: Iee8cbc07c4434ce9b560ffff13d06f1d9fb0cde5
Reviewed-by: Albert Astals Cid <aacid@kde.org>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 5ccd8c8d83..0f097517b7 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -101,9 +101,7 @@ QDBusAbstractInterfacePrivate::QDBusAbstractInterfacePrivate(const QString &serv void QDBusAbstractInterfacePrivate::initOwnerTracking() { - if (!isValid || !connection.isConnected() || connectionPrivate()->mode == QDBusConnectionPrivate::PeerMode) - return; - if (service.isEmpty() || service.startsWith(QLatin1Char(':'))) + if (!isValid || !connection.isConnected() || !connectionPrivate()->shouldWatchService(service)) return; QObject::connect(new QDBusServiceWatcher(service, connection, QDBusServiceWatcher::WatchForOwnerChange, q_func()), SIGNAL(serviceOwnerChanged(QString,QString,QString)), |