2005-02-17 Colin Walters <walters@verbum.org>
+ * dbus/dbus-protocol.h (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS):
+ Rename to DBUS_SERVICE_DBUS.
+ (DBUS_PATH_ORG_FREEDESKTOP_DBUS): Rename to DBUS_PATH_DBUS.
+ (DBUS_PATH_ORG_FREEDESKTOP_LOCAL): Rename to DBUS_PATH_LOCAL.
+ (DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS): Rename to DBUS_INTERFACE_DBUS.
+ (DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE): Rename to
+ DBUS_INTERFACE_INTROSPECTABLE.
+ (DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES): Rename to
+ DBUS_INTERFACE_PROPERTIES.
+ (DBUS_INTERFACE_ORG_FREEDESKTOP_PEER): Rename to
+ DBUS_INTERFACE_PEER.
+ (DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL):
+ DBUS_INTERFACE_LOCAL.
+
+ All other users of those constants have been changed.
+
+ * bus/driver.c (bus_driver_handle_introspect): Use constants.
+
+ * glib/dbus-gobject.c (handle_introspect): Use constants.
+
+ * doc/dbus-faq.xml, doc/dbus-specification.xml: Update for rename.
+
+2005-02-17 Colin Walters <walters@verbum.org>
+
* glib/dbus-gparser.c (struct Parser): Add in_annotation boolean.
(parse_node, parse_interface, parse_method, parse_signal)
(parse_property, parse_annotation): Lose if we're currently in an
(sender == NULL && !bus_connection_is_active (proposed_recipient)));
_dbus_assert (type == DBUS_MESSAGE_TYPE_SIGNAL ||
addressed_recipient != NULL ||
- strcmp (dbus_message_get_destination (message), DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) == 0);
+ strcmp (dbus_message_get_destination (message), DBUS_SERVICE_DBUS) == 0);
switch (type)
{
dbus_message_get_interface (message),
dbus_message_get_member (message),
dbus_message_get_error_name (message),
- dest ? dest : DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ dest ? dest : DBUS_SERVICE_DBUS))
{
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED,
"An SELinux policy prevents this sender "
dbus_message_get_member (message) : "(unset)",
dbus_message_get_error_name (message) ?
dbus_message_get_error_name (message) : "(unset)",
- dest ? dest : DBUS_SERVICE_ORG_FREEDESKTOP_DBUS);
+ dest ? dest : DBUS_SERVICE_DBUS);
_dbus_verbose ("SELinux security check denying send to service\n");
return FALSE;
}
*/
if (proposed_recipient == NULL &&
dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ DBUS_INTERFACE_DBUS,
"Hello"))
{
_dbus_verbose ("security check allowing %s message\n",
dbus_message_get_member (message) : "(unset)",
dbus_message_get_error_name (message) ?
dbus_message_get_error_name (message) : "(unset)",
- dest ? dest : DBUS_SERVICE_ORG_FREEDESKTOP_DBUS);
+ dest ? dest : DBUS_SERVICE_DBUS);
_dbus_verbose ("security policy disallowing message due to sender policy\n");
return FALSE;
}
dbus_message_get_member (message) : "(unset)",
dbus_message_get_error_name (message) ?
dbus_message_get_error_name (message) : "(unset)",
- dest ? dest : DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
+ dest ? dest : DBUS_SERVICE_DBUS,
dbus_message_get_reply_serial (message),
requested_reply);
_dbus_verbose ("security policy disallowing message due to recipient policy\n");
"The destination service \"%s\" has a full message queue",
dest ? dest : (proposed_recipient ?
bus_connection_get_name (proposed_recipient) :
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS));
+ DBUS_SERVICE_DBUS));
_dbus_verbose ("security policy disallowing message due to full message queue\n");
return FALSE;
}
if (!dbus_message_set_error_name (message, DBUS_ERROR_NO_MEMORY) ||
!dbus_message_set_destination (message, d->name) ||
!dbus_message_set_sender (message,
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ DBUS_SERVICE_DBUS))
{
dbus_connection_free_preallocated_send (connection, preallocated);
dbus_message_unref (message);
dbus_message_get_error_name (message) ?
dbus_message_get_error_name (message) : "(no error name)");
- if (!dbus_message_set_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS))
return FALSE;
if (bus_connection_is_active (connection))
if (service_name == NULL)
{
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ DBUS_INTERFACE_LOCAL,
"Disconnected"))
{
bus_connection_disconnected (connection);
}
if (service_name &&
- strcmp (service_name, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) == 0) /* to bus driver */
+ strcmp (service_name, DBUS_SERVICE_DBUS) == 0) /* to bus driver */
{
if (!bus_context_check_security_policy (context, transaction,
connection, NULL, NULL, message, &error))
goto out;
}
- _dbus_verbose ("Giving message to %s\n", DBUS_SERVICE_ORG_FREEDESKTOP_DBUS);
+ _dbus_verbose ("Giving message to %s\n", DBUS_SERVICE_DBUS);
if (!bus_driver_handle_message (connection, transaction, message, &error))
goto out;
}
goto out;
}
else if (!dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameOwnerChanged"))
{
warn_unexpected (connection, message, "NameOwnerChanged");
_dbus_verbose ("check_hello_message for %p\n", connection);
- 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 == NULL)
verbose_message_received (connection, message);
- if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
{
_dbus_warn ("Message has wrong sender %s\n",
dbus_message_get_sender (message) ?
"NameAcquired");
goto out;
}
- if (! dbus_message_is_signal (message, DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ if (! dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
"NameAcquired"))
{
_dbus_warn ("Expecting %s, got smthg else\n",
_dbus_verbose ("check_double_hello_message for %p\n", connection);
- 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 == NULL)
verbose_message_received (connection, message);
- if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
{
_dbus_warn ("Message has wrong sender %s\n",
dbus_message_get_sender (message) ?
_dbus_verbose ("check_get_connection_unix_user for %p\n", connection);
- 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)
_dbus_verbose ("check_get_connection_unix_process_id for %p\n", connection);
- 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,
"GetConnectionUnixProcessID");
if (message == NULL)
_dbus_verbose ("check_add_match_all for %p\n", connection);
- 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,
"AddMatch");
if (message == NULL)
verbose_message_received (connection, message);
- if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
{
_dbus_warn ("Message has wrong sender %s\n",
dbus_message_get_sender (message) ?
const char *nonexistent = NONEXISTENT_SERVICE_NAME;
dbus_uint32_t flags;
- 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,
"StartServiceByName");
if (message == NULL)
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
{
- if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
{
_dbus_warn ("Message has wrong sender %s\n",
dbus_message_get_sender (message) ?
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
{
- if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
{
_dbus_warn ("Message has wrong sender %s\n",
dbus_message_get_sender (message) ?
dbus_message_ref (message);
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameOwnerChanged"))
{
CheckServiceOwnerChangedData socd;
dbus_message_ref (message);
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameOwnerChanged"))
{
CheckServiceOwnerChangedData socd;
dbus_message_ref (message);
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameOwnerChanged"))
{
const char *service_name;
GotServiceInfo message_kind;
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameOwnerChanged"))
{
DBusError error;
base_service_message = NULL;
- 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,
"StartServiceByName");
if (message == NULL)
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
{
- if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
{
_dbus_warn ("Message has wrong sender %s\n",
dbus_message_get_sender (message) ?
const char *segv_service;
dbus_uint32_t flags;
- 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,
"StartServiceByName");
if (message == NULL)
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
{
- if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
{
_dbus_warn ("Message has wrong sender %s\n",
dbus_message_get_sender (message) ?
if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_ERROR)
{
- if (!dbus_message_has_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_has_sender (message, DBUS_SERVICE_DBUS))
{
_dbus_warn ("Message has wrong sender %s\n",
dbus_message_get_sender (message) ?
old_owner ? old_owner : null_service,
new_owner ? new_owner : null_service);
- message = dbus_message_new_signal (DBUS_PATH_ORG_FREEDESKTOP_DBUS,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ message = dbus_message_new_signal (DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameOwnerChanged");
if (message == NULL)
return FALSE;
}
- if (!dbus_message_set_sender (message, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS))
goto oom;
if (!dbus_message_append_args (message,
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
- message = dbus_message_new_signal (DBUS_PATH_ORG_FREEDESKTOP_DBUS,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ message = dbus_message_new_signal (DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameLost");
if (message == NULL)
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
- message = dbus_message_new_signal (DBUS_PATH_ORG_FREEDESKTOP_DBUS,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ message = dbus_message_new_signal (DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameAcquired");
if (message == NULL)
{
/* Include the bus driver in the list */
- const char *v_STRING = DBUS_SERVICE_ORG_FREEDESKTOP_DBUS;
+ const char *v_STRING = DBUS_SERVICE_DBUS;
if (!dbus_message_iter_append_basic (&sub, DBUS_TYPE_STRING,
&v_STRING))
{
retval = FALSE;
- if (strcmp (name, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) == 0)
+ if (strcmp (name, DBUS_SERVICE_DBUS) == 0)
{
service_exists = TRUE;
}
_dbus_string_init_const (&str, text);
service = bus_registry_lookup (registry, &str);
if (service == NULL &&
- _dbus_string_equal_c_str (&str, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS))
+ _dbus_string_equal_c_str (&str, DBUS_SERVICE_DBUS))
{
/* ORG_FREEDESKTOP_DBUS owns itself */
- base_name = DBUS_SERVICE_ORG_FREEDESKTOP_DBUS;
+ base_name = DBUS_SERVICE_DBUS;
}
else if (service == NULL)
{
goto oom;
if (!_dbus_string_append (&xml, "<node>\n"))
goto oom;
- if (!_dbus_string_append (&xml, " <interface name=\"org.freedesktop.Introspectable\">\n"))
+ if (!_dbus_string_append_printf (&xml, " <interface name=\"%s\">\n", DBUS_INTERFACE_INTROSPECTABLE))
goto oom;
if (!_dbus_string_append (&xml, " <method name=\"Introspect\">\n"))
goto oom;
goto oom;
if (!_dbus_string_append_printf (&xml, " <interface name=\"%s\">\n",
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS))
+ DBUS_INTERFACE_DBUS))
goto oom;
i = 0;
}
if (dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+ DBUS_INTERFACE_INTROSPECTABLE,
"Introspect"))
return bus_driver_handle_introspect (connection, transaction, message, error);
interface = dbus_message_get_interface (message);
if (interface == NULL)
- interface = DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS;
+ interface = DBUS_INTERFACE_DBUS;
_dbus_assert (dbus_message_get_member (message) != NULL);
sender = dbus_message_get_sender (message);
if (strcmp (interface,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS) != 0)
+ DBUS_INTERFACE_DBUS) != 0)
{
_dbus_verbose ("Driver got message to unknown interface \"%s\"\n",
interface);
dbus_set_error (error, DBUS_ERROR_UNKNOWN_METHOD,
"%s does not understand message %s",
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS, name);
+ DBUS_SERVICE_DBUS, name);
return FALSE;
}
if (sender == NULL)
{
if (strcmp (rule->sender,
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) != 0)
+ DBUS_SERVICE_DBUS) != 0)
return FALSE;
}
else
if (addressed_recipient == NULL)
{
if (strcmp (rule->destination,
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) != 0)
+ DBUS_SERVICE_DBUS) != 0)
return FALSE;
}
else
void *user_data)
{
if (!dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ DBUS_INTERFACE_LOCAL,
"Disconnected"))
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
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)
_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)
_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)
_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)
{
_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,
_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)
_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,
*
* 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.
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)
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");
/** 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
{
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);
{
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);
* 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
reply = NULL;
if (!dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+ DBUS_INTERFACE_INTROSPECTABLE,
"Introspect"))
{
#ifdef DBUS_BUILD_TESTS
#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
generic <literal>TextEditor</literal>), have multiple objects (maybe
<literal>/org/kde/documents/4352</literal> where the number changes
according to the document), and each object could implement multiple
- interfaces, such as <literal>org.freedesktop.Introspectable</literal>,
+ interfaces, such as <literal>org.freedesktop.DBus.Introspectable</literal>,
<literal>org.freedesktop.BasicTextField</literal>,
<literal>org.kde.RichTextDocument</literal>.
</para>
that may be useful across various D-BUS applications.
</para>
<sect2 id="standard-interfaces-peer">
- <title><literal>org.freedesktop.Peer</literal></title>
+ <title><literal>org.freedesktop.DBus.Peer</literal></title>
<para>
- The <literal>org.freedesktop.Peer</literal> interface
+ The <literal>org.freedesktop.DBus.Peer</literal> interface
has one method:
<programlisting>
- org.freedesktop.Peer.Ping ()
+ org.freedesktop.DBus.Peer.Ping ()
</programlisting>
</para>
<para>
On receipt of the <literal>METHOD_CALL</literal> message
- <literal>org.freedesktop.Peer.Ping</literal>, an application should do
+ <literal>org.freedesktop.DBus.Peer.Ping</literal>, an application should do
nothing other than reply with a <literal>METHOD_RETURN</literal> as
usual. It does not matter which object path a ping is sent to. The
reference implementation should simply handle this method on behalf of
</sect2>
<sect2 id="standard-interfaces-introspectable">
- <title><literal>org.freedesktop.Introspectable</literal></title>
+ <title><literal>org.freedesktop.DBus.Introspectable</literal></title>
<para>
This interface has one method:
<programlisting>
- org.freedesktop.Introspectable.Introspect (out STRING xml_data)
+ org.freedesktop.DBus.Introspectable.Introspect (out STRING xml_data)
</programlisting>
</para>
<para>
</para>
</sect2>
<sect2 id="standard-interfaces-properties">
- <title><literal>org.freedesktop.Properties</literal></title>
+ <title><literal>org.freedesktop.DBus.Properties</literal></title>
<para>
Many native APIs will have a concept of object <firstterm>properties</firstterm>
or <firstterm>attributes</firstterm>. These can be exposed via the
- <literal>org.freedesktop.Properties</literal> interface.
+ <literal>org.freedesktop.DBus.Properties</literal> interface.
</para>
<para>
<programlisting>
- org.freedesktop.Properties.Get (in STRING interface_name,
- in STRING property_name,
- out VARIANT value);
- org.freedesktop.Properties.Set (in STRING interface_name,
- in STRING property_name,
- in VARIANT value);
+ org.freedesktop.DBus.Properties.Get (in STRING interface_name,
+ in STRING property_name,
+ out VARIANT value);
+ org.freedesktop.DBus.Properties.Set (in STRING interface_name,
+ in STRING property_name,
+ in VARIANT value);
</programlisting>
</para>
<para>
The available properties and whether they are writable can be determined
- by calling <literal>org.freedesktop.Introspectable.Introspect</literal>,
+ by calling <literal>org.freedesktop.DBus.Introspectable.Introspect</literal>,
see <xref linkend="standard-interfaces-introspectable"/>.
</para>
<para>
<literal>DESTINATION</literal> field is absent, the call is taken to be
a standard one-to-one message and interpreted by the message bus
itself. For example, sending an
- <literal>org.freedesktop.Peer.Ping</literal> message with no
+ <literal>org.freedesktop.DBus.Peer.Ping</literal> message with no
<literal>DESTINATION</literal> will cause the message bus itself to
reply to the ping immediately; the message bus will not make this
message visible to other applications.
</para>
<para>
- Continuing the <literal>org.freedesktop.Peer.Ping</literal> example, if
+ Continuing the <literal>org.freedesktop.DBus.Peer.Ping</literal> example, if
the ping message were sent with a <literal>DESTINATION</literal> name of
<literal>com.yoyodyne.Screensaver</literal>, then the ping would be
forwarded, and the Yoyodyne Corporation screensaver application would be
g_string_append (xml, "<node>\n");
/* We are introspectable, though I guess that was pretty obvious */
- g_string_append (xml, " <interface name=\"org.freedesktop.Introspectable\">\n");
+ g_string_append_printf (xml, " <interface name=\"%s\">\n", DBUS_INTERFACE_INTROSPECTABLE);
g_string_append (xml, " <method name=\"Introspect\">\n");
g_string_append (xml, " <arg name=\"data\" direction=\"out\" type=\"string\"/>\n");
g_string_append (xml, " </method>\n");
g_string_append (xml, " </interface>\n");
/* We support get/set properties */
- g_string_append (xml, " <interface name=\"org.freedesktop.Properties\">\n");
+ g_string_append_printf (xml, " <interface name=\"%s\">\n", DBUS_INTERFACE_PROPERTIES);
g_string_append (xml, " <method name=\"Get\">\n");
g_string_append (xml, " <arg name=\"interface\" direction=\"in\" type=\"string\"/>\n");
g_string_append (xml, " <arg name=\"propname\" direction=\"in\" type=\"string\"/>\n");
object = G_OBJECT (user_data);
if (dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+ DBUS_INTERFACE_INTROSPECTABLE,
"Introspect"))
return handle_introspect (connection, message, object);
getter = FALSE;
setter = FALSE;
if (dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES,
+ DBUS_INTERFACE_PROPERTIES,
"Get"))
getter = TRUE;
else if (dbus_message_is_method_call (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_PROPERTIES,
+ DBUS_INTERFACE_PROPERTIES,
"Set"))
setter = TRUE;
LOCK_MANAGER (manager);
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ DBUS_INTERFACE_LOCAL,
"Disconnected"))
{
/* Destroy all the proxies, quite possibly resulting in unreferencing
unique_name = NULL;
reply = NULL;
- request = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
- DBUS_PATH_ORG_FREEDESKTOP_DBUS,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ request = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS,
"GetNameOwner");
if (request == NULL)
g_error ("Out of memory");
HEADER_FIELD INTERFACE
TYPE STRING
-STRING 'org.freedesktop.Local'
+STRING 'org.freedesktop.DBus.Local'
HEADER_FIELD MEMBER
TYPE STRING
STRING 'Disconnected'
/* Create a proxy object for the "bus driver" */
driver = dbus_g_proxy_new_for_name (connection,
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
- DBUS_PATH_ORG_FREEDESKTOP_DBUS,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS);
+ DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS);
/* Call ListNames method */
ClientData *cd)
{
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ DBUS_INTERFACE_LOCAL,
"Disconnected"))
{
g_printerr ("Client thread disconnected\n");
ServerData *sd = user_data;
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ DBUS_INTERFACE_LOCAL,
"Disconnected"))
{
g_printerr ("Client disconnected from server\n");
WithBusServer *server = user_data;
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ DBUS_INTERFACE_LOCAL,
"Disconnected"))
{
g_printerr ("Server disconnected from message bus\n");
exit (1);
}
else if (dbus_message_has_sender (message,
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) &&
+ DBUS_SERVICE_DBUS) &&
dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+ DBUS_INTERFACE_DBUS,
"NameOwnerChanged"))
{
const char *name, *old_owner, *new_owner;
0, NULL); /* ignore errors because we suck */
rule = g_strdup_printf ("type='signal',sender='%s',member='%s'",
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
+ DBUS_SERVICE_DBUS,
"NameOwnerChanged");
/* ignore errors because we suck */
obj);
driver_proxy = dbus_g_proxy_new_for_name (connection,
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
- DBUS_PATH_ORG_FREEDESKTOP_DBUS,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS);
+ DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS);
v_STRING = "org.freedesktop.DBus.TestSuiteGLibService";
v_UINT32 = 0;
DBusMessage *message,
void *user_data)
{
- if (!dbus_message_is_signal (message, DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ if (!dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL,
"Disconnected"))
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
void *user_data)
{
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ DBUS_INTERFACE_LOCAL,
"Disconnected"))
{
dbus_connection_disconnect (connection);
print_message (message);
if (dbus_message_is_signal (message,
- DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+ DBUS_INTERFACE_LOCAL,
"Disconnected"))
exit (0);
names_model->driver_proxy =
dbus_g_proxy_new_for_name (names_model->connection,
- DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
- DBUS_PATH_ORG_FREEDESKTOP_DBUS,
- DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS);
+ DBUS_SERVICE_DBUS,
+ DBUS_PATH_DBUS,
+ DBUS_INTERFACE_DBUS);
g_assert (names_model->driver_proxy);
dbus_g_proxy_add_signal (names_model->driver_proxy,
proxy = dbus_g_proxy_new_for_name (connection,
service_name,
path->str,
- DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE);
+ DBUS_INTERFACE_INTROSPECTABLE);
g_assert (proxy != NULL);
}
else
proxy = dbus_g_proxy_new_for_name_owner (connection,
service_name,
path->str,
- DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+ DBUS_INTERFACE_INTROSPECTABLE,
error);
if (proxy == NULL)
goto done;
root_proxy = dbus_g_proxy_new_for_name (lfsd->connection,
lfsd->service_name,
"/",
- DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE);
+ DBUS_INTERFACE_INTROSPECTABLE);
g_assert (root_proxy != NULL);
#else
/* this will be an error if the service doesn't exist */
root_proxy = dbus_g_proxy_new_for_name_owner (lfsd->connection,
lfsd->service_name,
"/",
- DBUS_INTERFACE_ORG_FREEDESKTOP_INTROSPECTABLE,
+ DBUS_INTERFACE_INTROSPECTABLE,
&lfsd->error);
if (root_proxy == NULL)
{
projects / platform / upstream / dbus.git / commitdiff