summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--bus/connection.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1c4dd6..2beb2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-02-10 John (J5) Palmieri <johnp@redhat.com>
+ * bus/connection.c (bus_connections_expect_reply): Make
+ pending reply limit not common to all connections (Bug #5416)
+ Patch from Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+2006-02-10 John (J5) Palmieri <johnp@redhat.com>
+
* tools/dbus-launch.c: Fixed csh syntax output (Bug #5720)
2006-02-10 John (J5) Palmieri <johnp@redhat.com>
diff --git a/bus/connection.c b/bus/connection.c
index 90c6b75..d15a426 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -1606,7 +1606,8 @@ bus_connections_expect_reply (BusConnections *connections,
link = _dbus_list_get_next_link (&connections->pending_replies->items,
link);
- ++count;
+ if (pending->will_get_reply == will_get_reply)
+ ++count;
}
if (count >=