projects
/
platform
/
upstream
/
dbus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aea8da0
)
Always get current time in _dbus_connection_block_pending_call
author
Christian Dywan
<christian.dywan@lanedo.com>
Tue, 21 Sep 2010 12:43:39 +0000
(14:43 +0200)
committer
Will Thompson
<will.thompson@collabora.co.uk>
Tue, 5 Oct 2010 13:50:22 +0000
(14:50 +0100)
dbus/dbus-connection.c
patch
|
blob
|
history
diff --git
a/dbus/dbus-connection.c
b/dbus/dbus-connection.c
index
6f38d14
..
fc68b98
100644
(file)
--- a/
dbus/dbus-connection.c
+++ b/
dbus/dbus-connection.c
@@
-2385,10
+2385,10
@@
_dbus_connection_block_pending_call (DBusPendingCall *pending)
* below
*/
timeout = _dbus_pending_call_get_timeout_unlocked (pending);
+ _dbus_get_current_time (&start_tv_sec, &start_tv_usec);
if (timeout)
{
timeout_milliseconds = dbus_timeout_get_interval (timeout);
- _dbus_get_current_time (&start_tv_sec, &start_tv_usec);
_dbus_verbose ("dbus_connection_send_with_reply_and_block(): will block %d milliseconds for reply serial %u from %ld sec %ld usec\n",
timeout_milliseconds,