From 248895207dc15914ac7970a6d1431308075dca1d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 17 Feb 2005 21:19:49 +0000 Subject: 2005-02-17 Colin Walters * 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. --- tools/dbus-monitor.c | 2 +- tools/dbus-names-model.c | 6 +++--- tools/dbus-viewer.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tools') diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index 0ae7570f..fa9a9da6 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -35,7 +35,7 @@ filter_func (DBusConnection *connection, print_message (message); if (dbus_message_is_signal (message, - DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + DBUS_INTERFACE_LOCAL, "Disconnected")) exit (0); diff --git a/tools/dbus-names-model.c b/tools/dbus-names-model.c index 82016f2f..ab83e5f2 100644 --- a/tools/dbus-names-model.c +++ b/tools/dbus-names-model.c @@ -245,9 +245,9 @@ names_model_set_connection (NamesModel *names_model, 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, diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c index 338b8e05..e8ed5432 100644 --- a/tools/dbus-viewer.c +++ b/tools/dbus-viewer.c @@ -169,7 +169,7 @@ load_child_nodes (const char *service_name, 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 @@ -177,7 +177,7 @@ load_child_nodes (const char *service_name, 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; @@ -283,14 +283,14 @@ load_from_service_thread_func (void *thread_data) 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) { -- cgit