summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-server-unix.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-03-31 08:19:50 +0000
committerHavoc Pennington <hp@redhat.com>2003-03-31 08:19:50 +0000
commit29c71168cd17b11eed65023c97aff401d5305b01 (patch)
tree431a05106d857cf38abbdea74a375326f395485e /dbus/dbus-server-unix.h
parentbc86794f23fa538a405813fb61b531c2eacc9ae1 (diff)
2003-03-31 Havoc Pennington <hp@pobox.com>
* dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket) (_dbus_transport_new_for_tcp_socket): these didn't need the "server" argument since they are always client side * dbus/dbus-server.c (dbus_server_get_address): new function * bus/main.c (main): take the configuration file as an argument. * test/data/valid-config-files/debug-allow-all.conf: new file to use with dispatch.c tests for example * bus/test-main.c (main): require test data dir * bus/bus.c (bus_context_new): change this to take a configuration file name as argument * doc/config-file.txt (Elements): add <servicedir> * bus/system.conf, bus/session.conf: new files * dbus/dbus-bus.c (dbus_bus_get): look for system bus on well-known socket if none set * configure.in: create system.conf and session.conf
Diffstat (limited to 'dbus/dbus-server-unix.h')
-rw-r--r--dbus/dbus-server-unix.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/dbus/dbus-server-unix.h b/dbus/dbus-server-unix.h
index 947425b1..1d038db0 100644
--- a/dbus/dbus-server-unix.h
+++ b/dbus/dbus-server-unix.h
@@ -28,12 +28,14 @@
DBUS_BEGIN_DECLS;
-DBusServer* _dbus_server_new_for_fd (int fd);
-DBusServer* _dbus_server_new_for_domain_socket (const char *path,
- DBusError *error);
-DBusServer* _dbus_server_new_for_tcp_socket (const char *host,
- dbus_uint32_t port,
- DBusError *error);
+DBusServer* _dbus_server_new_for_fd (int fd,
+ const DBusString *address);
+DBusServer* _dbus_server_new_for_domain_socket (const char *path,
+ DBusError *error);
+DBusServer* _dbus_server_new_for_tcp_socket (const char *host,
+ dbus_uint32_t port,
+ DBusError *error);
+
DBUS_END_DECLS;