dbus/bus connection.c,1.60,1.61

Havoc Pennington hp at freedesktop.org
Thu Aug 4 03:42:59 EST 2005


Update of /cvs/dbus/dbus/bus
In directory gabe:/tmp/cvs-serv22422/bus

Modified Files:
	connection.c 
Log Message:
2005-08-03  Havoc Pennington  <hp at redhat.com>

	* dbus/dbus-sysdeps.c (_dbus_read_credentials_unix_socket): fix
	typo, from Julien Puydt

	* bus/connection.c (bus_connection_disconnected): we were always
	doing a wait_for_memory due to a buggy loop, found by Timo Hoenig



Index: connection.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/connection.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- connection.c	2 Jun 2005 17:41:04 -0000	1.60
+++ connection.c	3 Aug 2005 17:42:56 -0000	1.61
@@ -199,12 +199,8 @@
       
       dbus_error_init (&error);
         
-      transaction = NULL;
-      while (transaction == NULL)
-        {
-          transaction = bus_transaction_new (d->connections->context);
-          _dbus_wait_for_memory ();
-        }
+      while ((transaction = bus_transaction_new (d->connections->context)) == NULL)
+        _dbus_wait_for_memory ();
         
       if (!bus_service_remove_owner (service, connection,
                                      transaction, &error))



More information about the dbus-commit mailing list