Revert "Bug 17754 - Fixed race condition in protected_change_timeout."

This reverts commit b82ff17d7dd9689ab664e4a6c2a86c6f3dbfba69 and
9280395330c833dd98d0811d31349c26a84b2f6a.

Conflicts:

	dbus/dbus-connection.c

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 16ba2c77109ec401ce6b8628c36fb434f694ca99..7f828c5fca8f387a65b73da9ca135e0814a43fd4 100644 (file)
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -785,7 +785,6 @@ protected_change_timeout (DBusConnection           *connection,
    * drop lock and call out" one; but it has to be propagated up through all callers
    */
   
-retry:
   timeouts = connection->timeouts;
   if (timeouts)
     {
@@ -813,12 +812,7 @@ retry:
       return retval;
     }
   else
-    {
-      CONNECTION_UNLOCK (connection);
-      _dbus_sleep_milliseconds (1);
-      CONNECTION_LOCK (connection);
-      goto retry;
-    }
+    return FALSE;
 }
 
 /**