summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-transport.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2006-09-16 17:38:24 +0000
committerHavoc Pennington <hp@redhat.com>2006-09-16 17:38:24 +0000
commit8027efc97b4bec85f674570f878919cb72456745 (patch)
tree441ffafa5367bdb93c8bfa7f8ec51acfeb432b0b /dbus/dbus-transport.h
parenta0a12210e1f5aa5bd185a57d4394b8eb51cbe472 (diff)
voc Pennington <hp@redhat.com>
* dbus/dbus-server.c (dbus_server_listen): change how this works to be able to delegate to a set of handlers that can succeed, fail, or choose not to handle. Allows us to have dbus_server_listen_platform_specific. * dbus/dbus-server-socket.c (_dbus_server_new_for_tcp_socket): factor out the tcp socket stuff to be used on windows, leaving unix domain socket only in dbus-socket-unix.c * dbus/dbus-transport-socket.c (_dbus_transport_new_for_tcp_socket): factor out the tcp socket stuff to be used on windows, leaving unix domain socket only in dbus-transport-unix.c * dbus/dbus-connection.c (dbus_connection_get_unix_user): insert temporary hack to be sure this fails on windows (dbus_connection_get_unix_process_id): ditto
Diffstat (limited to 'dbus/dbus-transport.h')
-rw-r--r--dbus/dbus-transport.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/dbus/dbus-transport.h b/dbus/dbus-transport.h
index 502cfb05..4784e462 100644
--- a/dbus/dbus-transport.h
+++ b/dbus/dbus-transport.h
@@ -56,11 +56,10 @@ long _dbus_transport_get_max_message_size (DBusTransport
void _dbus_transport_set_max_received_size (DBusTransport *transport,
long size);
long _dbus_transport_get_max_received_size (DBusTransport *transport);
+dbus_bool_t _dbus_transport_get_socket_fd (DBusTransport *transport,
+ int *fd_p);
dbus_bool_t _dbus_transport_get_unix_user (DBusTransport *transport,
unsigned long *uid);
-dbus_bool_t _dbus_transport_get_unix_fd (DBusTransport *transport,
- int *fd_p);
-
dbus_bool_t _dbus_transport_get_unix_process_id (DBusTransport *transport,
unsigned long *pid);
void _dbus_transport_set_unix_user_function (DBusTransport *transport,