[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kde4/playground/libs/qt-dbus
From:       Thiago Macieira <thiago () kde ! org>
Date:       2006-04-29 10:04:49
Message-ID: 1146305089.948381.3291.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 535325 by thiago:

Fix assertion failure by centralising the place where ->conn is set

 M  +2 -2      qdbusintegrator.cpp  


--- branches/work/kde4/playground/libs/qt-dbus/qdbusintegrator.cpp #535324:535325
@@ -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;
[prev in list] [next in list] [prev in thread] [next in thread]