diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-24 19:35:11 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-24 19:35:11 +0000 |
| commit | e8bf15b23a2a9c5b19ef25fb553006a41379bf7c (patch) | |
| tree | 074ce3ddd02c11563a95f78f3ce9f4f40cb139c4 /bus | |
| parent | c9cd648f115759176d35508e9007dc5520a0dd3f (diff) | |
2003-04-24 Havoc Pennington <hp@redhat.com>
* dbus/dbus-message.c (dbus_message_name_is): rename
(dbus_message_service_is): rename
(dbus_message_sender_is): rename
(dbus_message_get_service): rename
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/bus.c | 6 | ||||
| -rw-r--r-- | bus/dispatch.c | 4 | ||||
| -rw-r--r-- | bus/policy.c | 16 |
3 files changed, 13 insertions, 13 deletions
@@ -889,7 +889,7 @@ bus_context_check_security_policy (BusContext *context, context->registry, recipient, message)) { - const char *dest = dbus_message_get_service (message); + const char *dest = dbus_message_get_destination (message); dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, "A security policy in place prevents this sender " "from sending this message to this recipient, " @@ -905,7 +905,7 @@ bus_context_check_security_policy (BusContext *context, context->registry, sender, message)) { - const char *dest = dbus_message_get_service (message); + const char *dest = dbus_message_get_destination (message); dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, "A security policy in place prevents this recipient " "from receiving this message from this sender, " @@ -921,7 +921,7 @@ bus_context_check_security_policy (BusContext *context, dbus_connection_get_outgoing_size (recipient) > context->max_outgoing_bytes) { - const char *dest = dbus_message_get_service (message); + const char *dest = dbus_message_get_destination (message); dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED, "The destination service \"%s\" has a full message queue", dest ? dest : DBUS_SERVICE_DBUS); diff --git a/bus/dispatch.c b/bus/dispatch.c index e38b3402..14c6531e 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -125,7 +125,7 @@ bus_dispatch (DBusConnection *connection, /* Ref connection in case we disconnect it at some point in here */ dbus_connection_ref (connection); - service_name = dbus_message_get_service (message); + service_name = dbus_message_get_destination (message); message_name = dbus_message_get_name (message); _dbus_assert (message_name != NULL); /* DBusMessageLoader is supposed to check this */ @@ -176,7 +176,7 @@ bus_dispatch (DBusConnection *connection, * reallocated, and thus the service_name pointer will become * invalid. */ - service_name = dbus_message_get_service (message); + service_name = dbus_message_get_destination (message); } if (strcmp (service_name, DBUS_SERVICE_DBUS) == 0) /* to bus driver */ diff --git a/bus/policy.c b/bus/policy.c index 7d9b4b76..0a002a8c 100644 --- a/bus/policy.c +++ b/bus/policy.c @@ -693,8 +693,8 @@ bus_client_policy_check_can_send (BusClientPolicy *policy, if (rule->d.send.message_name != NULL) { - if (!dbus_message_name_is (message, - rule->d.send.message_name)) + if (!dbus_message_has_name (message, + rule->d.send.message_name)) continue; } @@ -707,8 +707,8 @@ bus_client_policy_check_can_send (BusClientPolicy *policy, */ if (receiver == NULL) { - if (!dbus_message_sender_is (message, - rule->d.send.destination)) + if (!dbus_message_has_sender (message, + rule->d.send.destination)) continue; } else @@ -765,8 +765,8 @@ bus_client_policy_check_can_receive (BusClientPolicy *policy, if (rule->d.receive.message_name != NULL) { - if (!dbus_message_name_is (message, - rule->d.receive.message_name)) + if (!dbus_message_has_name (message, + rule->d.receive.message_name)) continue; } @@ -779,8 +779,8 @@ bus_client_policy_check_can_receive (BusClientPolicy *policy, */ if (sender == NULL) { - if (!dbus_message_sender_is (message, - rule->d.receive.origin)) + if (!dbus_message_has_sender (message, + rule->d.receive.origin)) continue; } else |