diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-08-18 15:27:33 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-08-18 15:27:33 +0000 |
| commit | 95717a938b237d12211935f6a7467ef610288fe5 (patch) | |
| tree | 9182521c86f31e74ad642eb19b431a433859c85f /dbus/dbus-message.h | |
| parent | 7c3693a53b4eba0db1aebe1edab5ded21eb7757f (diff) | |
2003-08-17 Havoc Pennington <hp@pobox.com>
This doesn't compile yet, but syncing up so I can hack on it from
work. What are branches for if not broken code? ;-)
* dbus/dbus-protocol.h: remove DBUS_HEADER_FIELD_NAME, add
DBUS_HEADER_FIELD_INTERFACE, DBUS_HEADER_FIELD_MEMBER,
DBUS_HEADER_FIELD_ERROR_NAME
* dbus/dbus-hash.c: Introduce DBUS_HASH_TWO_STRINGS as hack to use
for the interface+member pairs
(string_hash): change to use g_str_hash algorithm
(find_direct_function, find_string_function): refactor these to
share most code.
* dbus/dbus-message.c: port all of this over to support
interface/member fields instead of name field
* dbus/dbus-object-registry.c: port over
* dbus/dbus-string.c (_dbus_string_validate_interface): rename
from _dbus_string_validate_name
* bus/dbus-daemon-1.1: change file format for the
<deny>/<allow> stuff to match new message naming scheme
* bus/policy.c: port over
* bus/config-parser.c: parse new format
Diffstat (limited to 'dbus/dbus-message.h')
| -rw-r--r-- | dbus/dbus-message.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h index 1b61c8d1..dc204585 100644 --- a/dbus/dbus-message.h +++ b/dbus/dbus-message.h @@ -58,10 +58,12 @@ struct DBusMessageIter }; DBusMessage* dbus_message_new (int message_type); -DBusMessage* dbus_message_new_method_call (const char *name, +DBusMessage* dbus_message_new_method_call (const char *interface, + const char *method, const char *destination_service); DBusMessage* dbus_message_new_method_return (DBusMessage *method_call); -DBusMessage* dbus_message_new_signal (const char *name); +DBusMessage* dbus_message_new_signal (const char *interface, + const char *name); DBusMessage* dbus_message_new_error (DBusMessage *reply_to, const char *error_name, const char *error_message); @@ -71,9 +73,15 @@ DBusMessage *dbus_message_copy (const DBusMessage *message); void dbus_message_ref (DBusMessage *message); void dbus_message_unref (DBusMessage *message); int dbus_message_get_type (DBusMessage *message); -dbus_bool_t dbus_message_set_name (DBusMessage *message, +dbus_bool_t dbus_message_set_interface (DBusMessage *message, + const char *interface); +const char* dbus_message_get_interface (DBusMessage *message); +dbus_bool_t dbus_message_set_member (DBusMessage *message, + const char *member); +const char* dbus_message_get_member (DBusMessage *message); +dbus_bool_t dbus_message_set_error_name (DBusMessage *message, const char *name); -const char* dbus_message_get_name (DBusMessage *message); +const char* dbus_message_get_error_name (DBusMessage *message); dbus_bool_t dbus_message_set_destination (DBusMessage *message, const char *destination); const char* dbus_message_get_destination (DBusMessage *message); @@ -83,7 +91,11 @@ const char* dbus_message_get_sender (DBusMessage *message); void dbus_message_set_no_reply (DBusMessage *message, dbus_bool_t no_reply); dbus_bool_t dbus_message_get_no_reply (DBusMessage *message); -dbus_bool_t dbus_message_has_name (DBusMessage *message, +dbus_bool_t dbus_message_has_interface (DBusMessage *message, + const char *interface); +dbus_bool_t dbus_message_has_member (DBusMessage *message, + const char *member); +dbus_bool_t dbus_message_has_error_name (DBusMessage *message, const char *name); dbus_bool_t dbus_message_has_destination (DBusMessage *message, const char *service); |