diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-06-12 09:18:45 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-06-12 09:18:45 +0000 |
| commit | 1afe0339cfaf57af72b01ae3600ef22e437a4922 (patch) | |
| tree | 7ebcaf700bc8b9331c020f98e3e50301127c4c8f /qt/src/qdbusintegrator.cpp | |
| parent | ddb936d99b382ea1108be251a27668b3e3a6359a (diff) | |
* qt/src/qdbusintegrator.cpp: Fix bug in parsing async methods
that took a QDBusMessage parameter.
* qt/src/qdbusbus.h: Add a default flag for RequestName.
* qt/tools/dbus.cpp: Don't use automatic call because we might
be calling an async method: request a reply.
Diffstat (limited to 'qt/src/qdbusintegrator.cpp')
| -rw-r--r-- | qt/src/qdbusintegrator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) |