diff options
Diffstat (limited to 'qt/src')
| -rw-r--r-- | qt/src/qdbusbus.h | 3 | ||||
| -rw-r--r-- | qt/src/qdbusintegrator.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qt/src/qdbusbus.h b/qt/src/qdbusbus.h index 1f695798..0240e65f 100644 --- a/qt/src/qdbusbus.h +++ b/qt/src/qdbusbus.h @@ -58,6 +58,7 @@ public: // taken out of http://dbus.freedesktop.org/doc/dbus-specification.html // update if the standard updates enum RequestNameOption { + QueueName = 0x0, AllowReplacingName = 0x1, ReplaceExistingName = 0x2, DoNotQueueName = 0x4 @@ -127,7 +128,7 @@ public Q_SLOTS: { return GetNameOwner(name); } QDBusReply<ReleaseNameReply> releaseName(const QString &serviceName) { return ReleaseName(serviceName); } - QDBusReply<RequestNameReply> requestName(const QString &serviceName, RequestNameOptions flags) + QDBusReply<RequestNameReply> requestName(const QString &serviceName, RequestNameOptions flags = QueueName) { return RequestName(serviceName, flags); } QDBusReply<QStringList> listQueuedOwners(const QString &serviceName) { return ListQueuedOwners(serviceName); } diff --git a/qt/src/qdbusintegrator.cpp b/qt/src/qdbusintegrator.cpp index de012c19..509e110f 100644 --- a/qt/src/qdbusintegrator.cpp +++ b/qt/src/qdbusintegrator.cpp @@ -413,7 +413,7 @@ static int findSlot(const QMetaObject *mo, const QByteArray &name, int flags, continue; // we didn't match them all // consistency check: - if (isAsync && metaTypes.count() > i + 1) + if (isAsync && metaTypes.count() > i + 1 + (hasMessage ? 1 : 0)) continue; if (hasMessage && (mm.attributes() & attributeMask) != attributeMask) |