From 7f4d9bb0231e50b1be39cb2e3bc6aaf844081c3a Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 29 Apr 2006 10:07:42 +0000 Subject: * qt/qdbusintegrator.cpp: Fix assertion failure spotted by Brad Hards. --- ChangeLog | 5 +++++ qt/qdbusintegrator.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 396990c..7a07e13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-29 Thiago Macieira + + * qt/qdbusintegrator.cpp: Fix assertion failure spotted by + Brad Hards. + 2005-04-28 Robert McQueen * glib/dbus-gproxy.c: Fix properties so that they can be given in diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp index 4dabd43..bef8268 100644 --- a/qt/qdbusintegrator.cpp +++ b/qt/qdbusintegrator.cpp @@ -575,7 +575,6 @@ bool QDBusConnectionPrivate::activateSignal(const QDBusConnectionPrivate::Signal // Slots receive read-only copies of the message (i.e., pass by value or by const-ref) CallDeliveryEvent *call = prepareReply(hook.obj, hook.midx, hook.params, msg); if (call) { - call->conn = this; postCallDeliveryEvent(call); return true; } @@ -633,7 +632,6 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, // found the slot to be called // prepare for the call: CallDeliveryEvent *call = new CallDeliveryEvent; - call->conn = this; // parameters: call->object = object; @@ -652,6 +650,8 @@ bool QDBusConnectionPrivate::activateCall(QObject* object, int flags, void QDBusConnectionPrivate::postCallDeliveryEvent(CallDeliveryEvent *data) { + Q_ASSERT(data); + data->conn = this; #if USE_OUTSIDE_DISPATCH callDeliveryMutex.lock(); callDeliveryState = data; -- cgit v1.2.3