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>

diff --git a/ChangeLog b/ChangeLog
index f1c4dd6d6e9701eb4a6eb770f06c6ac5a2ea6de5..2beb2ad954249af714dff213c1d794a54a4d87ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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)

diff --git a/bus/connection.c b/bus/connection.c
index 90c6b75b8fcc6911831ae22e5e41378358e1e069..d15a4266a4c4f118f86d1963d5408f58925e32a2 100644 (file)
--- 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 >=