* 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.

diff --git a/ChangeLog b/ChangeLog
index 8f48ca5..6a8eeff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-06-11  Thiago Macieira <thiago.macieira@trolltech.com>
 
+       * 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.
+
+2006-06-11  Thiago Macieira <thiago.macieira@trolltech.com>
+
        * test/qt/*: Update the testcases, including testing the new
         functionality of sending null QByteArray and QString over the
         bus. Add new headertest test and restore the old

diff --git a/qt/src/qdbusbus.h b/qt/src/qdbusbus.h
index 1f69579..0240e65 100644 (file)
--- 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 de012c1..509e110 100644 (file)
--- 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)

diff --git a/qt/tools/dbus.cpp b/qt/tools/dbus.cpp
index b2556ef..f628db9 100644 (file)
--- a/qt/tools/dbus.cpp
+++ b/qt/tools/dbus.cpp
@@ -237,7 +237,7 @@ void placeCall(const QString &service, const QString &path, const QString &inter
         exit(1);
     }
 
-    QDBusMessage reply = iface->callWithArgs(member, params);
+    QDBusMessage reply = iface->callWithArgs(member, params, QDBusInterface::NoUseEventLoop);
     if (reply.type() == QDBusMessage::ErrorMessage) {
         QDBusError err = reply;
         printf("Error: %s\n%s\n", qPrintable(err.name()), qPrintable(err.message()));