diff options
| author | Anders Carlsson <andersca@codefactory.se> | 2003-01-25 20:52:33 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@codefactory.se> | 2003-01-25 20:52:33 +0000 |
| commit | fdddf7246da9ea6ce841146e2befe843aede0466 (patch) | |
| tree | b38a5a51ba37186c4efe074a5a8b93f15e38c458 | |
| parent | a2a681582929ada667de5d05d5168f8a1f313800 (diff) | |
2003-01-25 Anders Carlsson <andersca@codefactory.se>
* dbus/dbus-internals.h:
Add _DBUS_HANDLE_OOM macro, it doesn't do anything currently.
* dbus/dbus-message.c: (dbus_message_get_sender):
* dbus/dbus-message.h:
Implement dbus_message_get_sender.
* dbus/dbus-protocol.h:
Add message and service defines.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | dbus/dbus-internals.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-message.c | 6 | ||||
| -rw-r--r-- | dbus/dbus-message.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-protocol.h | 12 |
5 files changed, 33 insertions, 1 deletions
@@ -1,5 +1,17 @@ 2003-01-25 Anders Carlsson <andersca@codefactory.se> + * dbus/dbus-internals.h: + Add _DBUS_HANDLE_OOM macro, it doesn't do anything currently. + + * dbus/dbus-message.c: (dbus_message_get_sender): + * dbus/dbus-message.h: + Implement dbus_message_get_sender. + + * dbus/dbus-protocol.h: + Add message and service defines. + +2003-01-25 Anders Carlsson <andersca@codefactory.se> + * dbus/dbus-connection.c: (dbus_connection_send_message): * dbus/dbus-message-internal.h: * dbus/dbus-message.c: (_dbus_message_get_client_serial), diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index f0baf46b..97d3e61d 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -93,6 +93,8 @@ do { #define _DBUS_STRUCT_OFFSET(struct_type, member) \ ((long) ((unsigned char*) &((struct_type*) 0)->member)) +#define _DBUS_HANDLE_OOM(stat) (stat) + /* This alignment thing is from ORBit2 */ /* Align a value upward to a boundary, expressed as a number of bytes. * E.g. align to an 8-byte boundary with argument of 8. diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index a42b797b..a81b6fbf 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -1116,6 +1116,12 @@ dbus_message_set_sender (DBusMessage *message, message->sender = _dbus_strdup (sender); } +const char* +dbus_message_get_sender (DBusMessage *message) +{ + return message->sender; +} + /** @} */ /** diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h index f5ef9159..879645b6 100644 --- a/dbus/dbus-message.h +++ b/dbus/dbus-message.h @@ -48,7 +48,7 @@ const char* dbus_message_get_name (DBusMessage *message); const char* dbus_message_get_service (DBusMessage *message); void dbus_message_set_sender (DBusMessage *message, const char *sender); - +const char* dbus_message_get_sender (DBusMessage *message); dbus_bool_t dbus_message_append_fields (DBusMessage *message, int first_field_type, diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index fb0169cd..fe397f41 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -55,6 +55,18 @@ extern "C" { #define DBUS_HEADER_FIELD_SERVICE "srvc" #define DBUS_HEADER_FIELD_REPLY "rply" #define DBUS_HEADER_FIELD_SENDER "sndr" + +/* Services */ +#define DBUS_SERVICE_DBUS "org.freedesktop.DBus" +#define DBUS_SERVICE_BROADCAST "org.freedesktop.DBus.Broadcast" + +/* Messages */ +#define DBUS_MESSAGE_HELLO "org.freedesktop.DBus.Hello" +#define DBUS_MESSAGE_LIST_SERVICES "org.freedesktop.DBus.ListServices" +#define DBUS_MESSAGE_SERVICE_CREATED "org.freedesktop.DBus.ServiceCreated" +#define DBUS_MESSAGE_SERVICE_DELETED "org.freedesktop.DBus.ServiceDeleted" +#define DBUS_MESSAGE_SERVICES "org.freedesktop.DBus.Services" +#define DBUS_MESSAGE_WELCOME "org.freedesktop.DBus.Welcome" #ifdef __cplusplus } |