diff options
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/dbus-bus.c | 42 | ||||
-rw-r--r-- | dbus/dbus-connection.c | 10 | ||||
-rw-r--r-- | dbus/dbus-marshal-header.c | 4 | ||||
-rw-r--r-- | dbus/dbus-message-factory.c | 4 | ||||
-rw-r--r-- | dbus/dbus-message.c | 2 | ||||
-rw-r--r-- | dbus/dbus-object-tree.c | 2 | ||||
-rw-r--r-- | dbus/dbus-protocol.h | 16 |
7 files changed, 40 insertions, 40 deletions
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index 92e9f963..188418c2 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -453,9 +453,9 @@ dbus_bus_register (DBusConnection *connection, return TRUE; } - message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - DBUS_PATH_ORG_FREEDESKTOP_DBUS, - DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + message = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "Hello"); if (!message) @@ -568,9 +568,9 @@ dbus_bus_get_unix_user (DBusConnection *connection, _dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), DBUS_UID_UNSET); _dbus_return_val_if_error_is_set (error, DBUS_UID_UNSET); - message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - DBUS_PATH_ORG_FREEDESKTOP_DBUS, - DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + message = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "GetConnectionUnixUser"); if (message == NULL) @@ -650,9 +650,9 @@ dbus_bus_request_name (DBusConnection *connection, _dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), 0); _dbus_return_val_if_error_is_set (error, 0); - message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - DBUS_PATH_ORG_FREEDESKTOP_DBUS, - DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + message = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "RequestName"); if (message == NULL) @@ -724,9 +724,9 @@ dbus_bus_name_has_owner (DBusConnection *connection, _dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), FALSE); _dbus_return_val_if_error_is_set (error, FALSE); - message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - DBUS_PATH_ORG_FREEDESKTOP_DBUS, - DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + message = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "NameHasOwner"); if (message == NULL) { @@ -793,9 +793,9 @@ dbus_bus_start_service_by_name (DBusConnection *connection, _dbus_return_val_if_fail (connection != NULL, FALSE); _dbus_return_val_if_fail (_dbus_check_is_valid_bus_name (name), FALSE); - msg = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - DBUS_PATH_ORG_FREEDESKTOP_DBUS, - DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "StartServiceByName"); if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &name, @@ -893,9 +893,9 @@ dbus_bus_add_match (DBusConnection *connection, _dbus_return_if_fail (rule != NULL); - msg = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - DBUS_PATH_ORG_FREEDESKTOP_DBUS, - DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "AddMatch"); if (msg == NULL) @@ -939,9 +939,9 @@ dbus_bus_remove_match (DBusConnection *connection, _dbus_return_if_fail (rule != NULL); - msg = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, - DBUS_PATH_ORG_FREEDESKTOP_DBUS, - DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + msg = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, "RemoveMatch"); if (!dbus_message_append_args (msg, DBUS_TYPE_STRING, &rule, diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 628f7a19..ae83af69 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -124,8 +124,8 @@ * * When a connection is disconnected, you are guaranteed to get a * signal "Disconnected" from the interface - * #DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, path - * #DBUS_PATH_ORG_FREEDESKTOP_LOCAL. + * #DBUS_INTERFACE_LOCAL, path + * #DBUS_PATH_LOCAL. * * You may not drop the last reference to a #DBusConnection * until that connection has been disconnected. @@ -1137,8 +1137,8 @@ _dbus_connection_new_for_transport (DBusTransport *transport) if (io_path_cond == NULL) goto error; - disconnect_message = dbus_message_new_signal (DBUS_PATH_ORG_FREEDESKTOP_LOCAL, - DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + disconnect_message = dbus_message_new_signal (DBUS_PATH_LOCAL, + DBUS_INTERFACE_LOCAL, "Disconnected"); if (disconnect_message == NULL) @@ -3214,7 +3214,7 @@ dbus_connection_dispatch (DBusConnection *connection) if (connection->exit_on_disconnect && dbus_message_is_signal (message, - DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + DBUS_INTERFACE_LOCAL, "Disconnected")) { _dbus_verbose ("Exiting on Disconnected signal\n"); diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c index 10d9e20b..cd6f8950 100644 --- a/dbus/dbus-marshal-header.c +++ b/dbus/dbus-marshal-header.c @@ -37,9 +37,9 @@ /** Static #DBusString containing the signature of a message header */ _DBUS_STRING_DEFINE_STATIC(_dbus_header_signature_str, DBUS_HEADER_SIGNATURE); /** Static #DBusString containing the local interface */ -_DBUS_STRING_DEFINE_STATIC(_dbus_local_interface_str, DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL); +_DBUS_STRING_DEFINE_STATIC(_dbus_local_interface_str, DBUS_INTERFACE_LOCAL); /** Static #DBusString containing the local path */ -_DBUS_STRING_DEFINE_STATIC(_dbus_local_path_str, DBUS_PATH_ORG_FREEDESKTOP_LOCAL); +_DBUS_STRING_DEFINE_STATIC(_dbus_local_path_str, DBUS_PATH_LOCAL); /** Offset from start of _dbus_header_signature_str to the signature of the fields array */ #define FIELDS_ARRAY_SIGNATURE_OFFSET 6 diff --git a/dbus/dbus-message-factory.c b/dbus/dbus-message-factory.c index 39df92f2..984b69d9 100644 --- a/dbus/dbus-message-factory.c +++ b/dbus/dbus-message-factory.c @@ -557,7 +557,7 @@ generate_special (DBusMessageDataIter *iter, { message = simple_method_call (); - if (!dbus_message_set_interface (message, DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL)) + if (!dbus_message_set_interface (message, DBUS_INTERFACE_LOCAL)) _dbus_assert_not_reached ("oom"); generate_from_message (data, expected_validity, message); @@ -568,7 +568,7 @@ generate_special (DBusMessageDataIter *iter, { message = simple_method_call (); - if (!dbus_message_set_path (message, DBUS_PATH_ORG_FREEDESKTOP_LOCAL)) + if (!dbus_message_set_path (message, DBUS_PATH_LOCAL)) _dbus_assert_not_reached ("oom"); generate_from_message (data, expected_validity, message); diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 71861689..dfe3b02b 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -2853,7 +2853,7 @@ dbus_message_has_destination (DBusMessage *message, * unique name of the connection as the sender. So you can't use this * function to see whether a sender owned a well-known name. * - * Messages from the bus itself will have #DBUS_SERVICE_ORG_FREEDESKTOP_DBUS + * Messages from the bus itself will have #DBUS_SERVICE_DBUS * as the sender. * * @param message the message diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c index b693b919..87624f5d 100644 --- a/dbus/dbus-object-tree.c +++ b/dbus/dbus-object-tree.c @@ -630,7 +630,7 @@ handle_default_introspect_and_unlock (DBusObjectTree *tree, reply = NULL; if (!dbus_message_is_method_call (message, - DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE, + DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) { #ifdef DBUS_BUILD_TESTS diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h index c662d721..d48c3e84 100644 --- a/dbus/dbus-protocol.h +++ b/dbus/dbus-protocol.h @@ -203,25 +203,25 @@ extern "C" { #define DBUS_MINIMUM_HEADER_SIZE 16 /* Services */ -#define DBUS_SERVICE_ORG_FREEDESKTOP_DBUS "org.freedesktop.DBus" +#define DBUS_SERVICE_DBUS "org.freedesktop.DBus" /* Paths */ -#define DBUS_PATH_ORG_FREEDESKTOP_DBUS "/org/freedesktop/DBus" -#define DBUS_PATH_ORG_FREEDESKTOP_LOCAL "/org/freedesktop/Local" +#define DBUS_PATH_DBUS "/org/freedesktop/DBus" +#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local" /* Interfaces, these #define don't do much other than * catch typos at compile time */ -#define DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS "org.freedesktop.DBus" -#define DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE "org.freedesktop.Introspectable" -#define DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES "org.freedesktop.Properties" -#define DBUS_INTERFACE_ORG_FREEDESKTOP_PEER "org.freedesktop.Peer" +#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus" +#define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable" +#define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties" +#define DBUS_INTERFACE_PEER "org.freedesktop.DBus.Peer" /* This is a special interface whose methods can only be invoked * by the local implementation (messages from remote apps aren't * allowed to specify this interface). */ -#define DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL "org.freedesktop.Local" +#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local" /* Owner flags */ #define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT 0x1 |