diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2010-10-22 22:32:20 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2010-10-22 22:32:20 +0000 |
| commit | 001c3f8aa7173260f2fb6f189df4c9cc5c61fce9 (patch) | |
| tree | c31132322f585f1e99368b2e92b1970c5331d0dc /devel/dbus/files/patch-dbus_dbus-connection.c | |
| parent | - Update to 0.93. (diff) | |
Update to 1.4.0.
Fix dbus launch on diskless systems [1]
PR: ports/151331 [1], ports/132304
Submitted by: Zane C.B. <vvelox@vvelox.net> [1]
Diffstat (limited to 'devel/dbus/files/patch-dbus_dbus-connection.c')
| -rw-r--r-- | devel/dbus/files/patch-dbus_dbus-connection.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/devel/dbus/files/patch-dbus_dbus-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c index b992b9e5e83f..f372d7600520 100644 --- a/devel/dbus/files/patch-dbus_dbus-connection.c +++ b/devel/dbus/files/patch-dbus_dbus-connection.c @@ -1,6 +1,6 @@ ---- dbus/dbus-connection.c.orig 2010-03-13 17:21:40.000000000 -0500 -+++ dbus/dbus-connection.c 2010-03-13 17:25:28.000000000 -0500 -@@ -2280,7 +2280,7 @@ _dbus_connection_block_pending_call (DBu +--- dbus/dbus-connection.c.orig 2010-08-31 21:44:19.000000000 +0000 ++++ dbus/dbus-connection.c 2010-09-18 18:01:19.000000000 +0000 +@@ -2364,7 +2364,7 @@ _dbus_connection_block_pending_call (DBu DBusConnection *connection; dbus_uint32_t client_serial; DBusTimeout *timeout; @@ -9,18 +9,20 @@ _dbus_assert (pending != NULL); -@@ -2360,6 +2360,10 @@ _dbus_connection_block_pending_call (DBu +@@ -2445,7 +2445,11 @@ _dbus_connection_block_pending_call (DBu _dbus_get_current_time (&tv_sec, &tv_usec); elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 + (tv_usec - start_tv_usec) / 1000; +- + if (timeout_milliseconds != -1) + remain_milliseconds = timeout_milliseconds - elapsed_milliseconds; + else + remain_milliseconds = -1; - ++ if (!_dbus_connection_get_is_connected_unlocked (connection)) { -@@ -2386,7 +2390,7 @@ _dbus_connection_block_pending_call (DBu + DBusMessage *error_msg; +@@ -2471,7 +2475,7 @@ _dbus_connection_block_pending_call (DBu */ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n"); @@ -29,8 +31,8 @@ } else { -@@ -2394,7 +2398,7 @@ _dbus_connection_block_pending_call (DBu - _dbus_connection_do_iteration_unlocked (connection, +@@ -2480,7 +2484,7 @@ _dbus_connection_block_pending_call (DBu + pending, DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK, - timeout_milliseconds - elapsed_milliseconds); @@ -38,7 +40,7 @@ } goto recheck_status; -@@ -2403,7 +2407,7 @@ _dbus_connection_block_pending_call (DBu +@@ -2489,7 +2493,7 @@ _dbus_connection_block_pending_call (DBu _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n"); else if (elapsed_milliseconds < timeout_milliseconds) { @@ -47,7 +49,7 @@ if (status == DBUS_DISPATCH_NEED_MEMORY) { -@@ -2413,7 +2417,7 @@ _dbus_connection_block_pending_call (DBu +@@ -2499,7 +2503,7 @@ _dbus_connection_block_pending_call (DBu */ _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n"); @@ -56,8 +58,8 @@ } else { -@@ -2421,7 +2425,7 @@ _dbus_connection_block_pending_call (DBu - _dbus_connection_do_iteration_unlocked (connection, +@@ -2508,7 +2512,7 @@ _dbus_connection_block_pending_call (DBu + NULL, DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK, - timeout_milliseconds - elapsed_milliseconds); |