diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-02-26 06:37:46 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-02-26 06:37:46 +0000 |
| commit | ee27481d7b7d6d9a4f41b7d641a2618dedf676dd (patch) | |
| tree | 73590d01384d365c867ffa7d43e28a9b2a432c87 /dbus/dbus-server-protected.h | |
| parent | 7ce7502e1ae23766ba40105327de787c2d1cef9d (diff) | |
2005-02-26 Havoc Pennington <hp@redhat.com>
* doc/TODO: remove the "guid" item
* test/glib/test-profile.c (no_bus_thread_func): use open_private
(with_bus_thread_func): use open_private
* dbus/dbus-connection.c (dbus_connection_open_private): new
function that works like the old dbus_connection_open()
(dbus_connection_open): now returns an existing connection if
possible
* dbus/dbus-server-unix.c (handle_new_client_fd_and_unlock): pass
through the GUID to the transport
* dbus/dbus-server.c (_dbus_server_init_base): keep around the
GUID in hex-encoded form.
* dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new):
pass GUID argument in to the transport
* dbus/dbus-transport-unix.c (_dbus_transport_new_for_fd): add
guid argument
* dbus/dbus-transport.c (_dbus_transport_init_base): add guid argument
* dbus/dbus-auth.c (_dbus_auth_server_new): add guid argument
Diffstat (limited to 'dbus/dbus-server-protected.h')
| -rw-r--r-- | dbus/dbus-server-protected.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h index dbbc3c62..7d09f64b 100644 --- a/dbus/dbus-server-protected.h +++ b/dbus/dbus-server-protected.h @@ -31,6 +31,7 @@ #include <dbus/dbus-watch.h> #include <dbus/dbus-resources.h> #include <dbus/dbus-dataslot.h> +#include <dbus/dbus-string.h> DBUS_BEGIN_DECLS @@ -67,7 +68,9 @@ struct DBusServer const DBusServerVTable *vtable; /**< Virtual methods for this instance. */ DBusMutex *mutex; /**< Lock on the server object */ - DBusGUID guid; /**< Globally unique ID of server */ + DBusGUID guid; /**< Globally unique ID of server */ + + DBusString guid_hex; /**< Hex-encoded version of GUID */ DBusWatchList *watches; /**< Our watches */ DBusTimeoutList *timeouts; /**< Our timeouts */ |