dbus/qt qdbusintegrator.cpp,1.8,1.9

[Thiago J. Macieira]

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

Modified Files:
	qdbusintegrator.cpp 
Log Message:
        * qt/qdbusintegrator.cpp: Fix assertion failure spotted by
        Brad Hards.


Index: qdbusintegrator.cpp
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusintegrator.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- qdbusintegrator.cpp	23 Apr 2006 19:04:53 -0000	1.8
+++ qdbusintegrator.cpp	29 Apr 2006 10:07:42 -0000	1.9
@@ -575,7 +575,6 @@
     // 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 @@
     // 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 @@
 
 void QDBusConnectionPrivate::postCallDeliveryEvent(CallDeliveryEvent *data)
 {
+    Q_ASSERT(data);
+    data->conn = this;    
 #if USE_OUTSIDE_DISPATCH
     callDeliveryMutex.lock();
     callDeliveryState = data;