diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-04-10 10:49:36 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-04-10 10:49:36 +0000 |
| commit | 399c44a133b8a2a409e30c271be74c93c42d992b (patch) | |
| tree | c4c83254c434deb8c6e6f857cb2d1bbf60366b88 /qt/qdbusintegrator.cpp | |
| parent | 68b0f5235909a25a7cc4f679592fc7765e845cbf (diff) | |
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)
Diffstat (limited to 'qt/qdbusintegrator.cpp')
| -rw-r--r-- | qt/qdbusintegrator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp index 38f71a11..a9467c00 100644 --- a/qt/qdbusintegrator.cpp +++ b/qt/qdbusintegrator.cpp @@ -995,6 +995,9 @@ bool QDBusConnectionPrivate::activateInternalFilters(const ObjectTreeNode *node, 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 @@ void QDBusConnectionPrivate::messageResultReceived(DBusPendingCall *pending, voi 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; |