summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--dbus/dbus-connection.c15
2 files changed, 13 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bb63ee3..b19e01dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-01-11 Joe Shaw <joeshaw@novell.com>
+
+ Patch from Timo Teräs <ext-timo.teras@nokia.com>
+
+ * dbus/dbus-connection.c
+ (_dbus_connection_queue_received_message_link): Call
+ _dbus_connection_remove_timeout() instead of the _locked()
+ variant, since it's always called from
+ _dbus_connection_handle_watch(), which handles the locking.
+ Removed the _locked() variant since it's no longer used.
+
2005-01-03 Havoc Pennington <hp@redhat.com>
* dbus/dbus-internals.h: I'm an idiot, _dbus_assert certainly can
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index e8c6a52b..41ca0a77 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -224,8 +224,6 @@ struct DBusConnection
#endif
};
-static void _dbus_connection_remove_timeout_locked (DBusConnection *connection,
- DBusTimeout *timeout);
static DBusDispatchStatus _dbus_connection_get_dispatch_status_unlocked (DBusConnection *connection);
static void _dbus_connection_update_dispatch_status_and_unlock (DBusConnection *connection,
DBusDispatchStatus new_status);
@@ -349,8 +347,8 @@ _dbus_connection_queue_received_message_link (DBusConnection *connection,
if (pending != NULL)
{
if (pending->timeout_added)
- _dbus_connection_remove_timeout_locked (connection,
- pending->timeout);
+ _dbus_connection_remove_timeout (connection,
+ pending->timeout);
pending->timeout_added = FALSE;
}
@@ -594,15 +592,6 @@ _dbus_connection_remove_timeout (DBusConnection *connection,
timeout);
}
-static void
-_dbus_connection_remove_timeout_locked (DBusConnection *connection,
- DBusTimeout *timeout)
-{
- CONNECTION_LOCK (connection);
- _dbus_connection_remove_timeout (connection, timeout);
- CONNECTION_UNLOCK (connection);
-}
-
/**
* Toggles a timeout and notifies app via connection's
* DBusTimeoutToggledFunction if available. It's an error to call this