dbus/qt/src qdbusbus.h,1.2,1.3 qdbusintegrator.cpp,1.2,1.3

[Thiago J. Macieira]

Update of /cvs/dbus/dbus/qt/src
In directory kemper:/tmp/cvs-serv24253/qt/src

Modified Files:
	qdbusbus.h qdbusintegrator.cpp 
Log Message:
	* 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.


Index: qdbusbus.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/src/qdbusbus.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qdbusbus.h	5 Jun 2006 18:13:07 -0000	1.2
+++ qdbusbus.h	12 Jun 2006 09:18:45 -0000	1.3
@@ -58,6 +58,7 @@
     // 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 @@
     { 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); }

Index: qdbusintegrator.cpp
===================================================================
RCS file: /cvs/dbus/dbus/qt/src/qdbusintegrator.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qdbusintegrator.cpp	5 Jun 2006 18:13:07 -0000	1.2
+++ qdbusintegrator.cpp	12 Jun 2006 09:18:45 -0000	1.3
@@ -413,7 +413,7 @@
             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)