From 12e838d766c14368112e0333146d77e806c151db Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Wed, 16 Apr 2008 10:49:25 -0400 Subject: take out trailing comma inside an enum so non gcc compilers don't error out * tools/dbus-monitor.c: take out the trailing comma in the ProfileAttributeFlags enum as it isn't in our style guides and causes some compilers to error out --- ChangeLog | 5 +++++ tools/dbus-monitor.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e69de29b..0bc33d45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,5 @@ +2008-04-16 John (J5) Palmieri + + * tools/dbus-monitor.c: take out the trailing comma in the + ProfileAttributeFlags enum as it isn't in our style guides + and causes some compilers to error out diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index 45d87181..ee03d854 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -91,7 +91,7 @@ typedef enum PROFILE_ATTRIBUTE_FLAG_PATH = 16, PROFILE_ATTRIBUTE_FLAG_INTERFACE = 32, PROFILE_ATTRIBUTE_FLAG_MEMBER = 64, - PROFILE_ATTRIBUTE_FLAG_ERROR_NAME = 128, + PROFILE_ATTRIBUTE_FLAG_ERROR_NAME = 128 } ProfileAttributeFlags; static void -- cgit From cdca6dbce88fd1e1195e2a81eb6619c782df2fac Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 17 May 2008 10:09:20 +0200 Subject: Prevent a crash in some applications due to timers leaking after the DVusPendingCall object was freed. * dbus-connection.c: Remove the timer for the pending call's timeout in case the reply has timed out in blocking code. This fixes bug 15684. --- dbus/dbus-connection.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 3a1670ca..7b13b249 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -965,6 +965,13 @@ _dbus_connection_detach_pending_call_and_unlock (DBusConnection *connection, _dbus_pending_call_ref_unlocked (pending); _dbus_hash_table_remove_int (connection->pending_replies, _dbus_pending_call_get_reply_serial_unlocked (pending)); + + if (_dbus_pending_call_is_timeout_added_unlocked (pending)) + _dbus_connection_remove_timeout_unlocked (connection, + _dbus_pending_call_get_timeout_unlocked (pending)); + + _dbus_pending_call_set_timeout_added_unlocked (pending, FALSE); + _dbus_pending_call_unref_and_unlock (pending); } -- cgit