From: Thiago Macieira <thiago@kde.org>
Date: Tue, 22 Jun 2010 12:54:38 +0000 (+0200)
Subject: Revert "Bug 17754 - Fixed race condition in protected_change_timeout."
X-Git-Tag: dbus-1.3.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e40c45fb4635321f17f3d6e4f9a4566fb62b3623;p=thirdparty%2Fdbus.git

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 16ba2c771..7f828c5fc 100644
--- 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;
 }
 
 /**