dbus/qt qdbusintegrator.cpp, 1.5, 1.6 qdbusinternalfilters.cpp, 1.2, 1.3 qt-dbus.qdocconf, 1.1, 1.2

[Thiago J. Macieira]

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

Modified Files:
	qdbusintegrator.cpp qdbusinternalfilters.cpp qt-dbus.qdocconf 
Log Message:
	Merge from Subversion:
	* qt/qt-dbus.qdocconf: Update Trolltech's webpage link to
	  something that exists (r526315)
	* qt/qdbusinternalfilters.cpp: Correctly detect non-scriptable
	  slots/signals (r526316)
	* qt/qdbusinternalfilters.cpp: Fix the setProperty call and
	  also return an unknown-method error if the parameters don't
	  match for org.freedesktop.DBus.Properties. (r526842)
	* qt/examples/dbus.cpp: Allow passing of QVariants (r526843)
	* qt/qdbusintegrator.cpp: Restore the proper order of
	  delivery: don't make method returns be delivered on priority
	  (r528150)


Index: qdbusintegrator.cpp
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusintegrator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qdbusintegrator.cpp	28 Mar 2006 18:56:08 -0000	1.5
+++ qdbusintegrator.cpp	10 Apr 2006 10:49:36 -0000	1.6
@@ -995,6 +995,9 @@
             qDBusPropertyGet(node, msg);
         else if (msg.method() == QLatin1String("Set") && msg.signature() == QLatin1String("ssv"))
             qDBusPropertySet(node, msg);
+        else
+            return false;
+            
         return true;
     }
 
@@ -1245,10 +1248,9 @@
         qDebug() << "got message: " << msg;
         CallDeliveryEvent *e = prepareReply(call->receiver, call->methodIdx, call->metaTypes, msg);
         if (e)
-            connection->deliverCall(*e);
+            connection->postCallDeliveryEvent(e);
         else
             qDebug() << "Deliver failed!";
-        delete e;
     }
     dbus_pending_call_unref(pending);
     delete call;

Index: qdbusinternalfilters.cpp
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusinternalfilters.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qdbusinternalfilters.cpp	28 Mar 2006 18:56:08 -0000	1.2
+++ qdbusinternalfilters.cpp	10 Apr 2006 10:49:36 -0000	1.3
@@ -152,9 +152,13 @@
                    .arg(isOutput ? QLatin1String("out") : QLatin1String("in"));
         }
 
-        if (!isScriptable &&
-            !(flags & (QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)))
-            continue;
+        if (!isScriptable) {
+            // check if this was added by other means
+            if (isSignal && (flags & QDBusConnection::ExportAllSignals) != QDBusConnection::ExportAllSignals)
+                continue;
+            if (!isSignal && (flags & QDBusConnection::ExportAllSlots) != QDBusConnection::ExportAllSlots)
+                continue;
+        }
 
         if (qDBusCheckAsyncTag(mm.tag()))
             // add the no-reply annotation
@@ -359,7 +363,7 @@
             }
     }
 
-    if (!value.isValid() && node->flags & QDBusConnection::ExportProperties) {
+    if (node->flags & QDBusConnection::ExportProperties) {
         // try the object itself
         int pidx = node->obj->metaObject()->indexOfProperty(property_name);
         if (pidx != -1) {

Index: qt-dbus.qdocconf
===================================================================
RCS file: /cvs/dbus/dbus/qt/qt-dbus.qdocconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qt-dbus.qdocconf	28 Mar 2006 18:56:08 -0000	1.1
+++ qt-dbus.qdocconf	10 Apr 2006 10:49:36 -0000	1.2
@@ -126,7 +126,7 @@
 
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"30%\">Copyright &copy; 2006 <a href=\"trolltech.html\">Trolltech</a></td>\n" \
+                          "<td width=\"30%\">Copyright &copy; 2006 <a href=\"http://www.trolltech.com\">Trolltech</a></td>\n" \
                           "<td width=\"40%\" align=\"center\">&nbsp;</td>\n" \
                           "<td width=\"30%\" align=\"right\"><div align=\"right\">QtDBus \\version</div></td>\n" \
                           "</tr></table></div></address>"