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.

6 files changed, 15 insertions, 15 deletions

diff --git a/test/data/invalid-messages/local-namespace.message b/test/data/invalid-messages/local-namespace.message
index f42b5c6a..8a720188 100644
--- a/test/data/invalid-messages/local-namespace.message
+++ b/test/data/invalid-messages/local-namespace.message
@@ -6,7 +6,7 @@ VALID_HEADER method_call
 
 HEADER_FIELD INTERFACE
 TYPE STRING
-STRING 'org.freedesktop.Local'
+STRING 'org.freedesktop.DBus.Local'
 HEADER_FIELD MEMBER
 TYPE STRING
 STRING 'Disconnected'
diff --git a/test/glib/test-dbus-glib.c b/test/glib/test-dbus-glib.c
index ca36af1f..94ce4699 100644
--- a/test/glib/test-dbus-glib.c
+++ b/test/glib/test-dbus-glib.c
@@ -67,9 +67,9 @@ main (int argc, char **argv)
   /* 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 */
   
diff --git a/test/glib/test-profile.c b/test/glib/test-profile.c
index 25d4eebb..ec0e4fd0 100644
--- a/test/glib/test-profile.c
+++ b/test/glib/test-profile.c
@@ -143,7 +143,7 @@ with_or_without_bus_client_filter (DBusConnection     *connection,
                                    ClientData         *cd)
 {
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     {
       g_printerr ("Client thread disconnected\n");
@@ -235,7 +235,7 @@ no_bus_server_filter (DBusConnection     *connection,
   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");
@@ -411,16 +411,16 @@ with_bus_server_filter (DBusConnection     *connection,
   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;
@@ -528,7 +528,7 @@ with_bus_init_server (ServerData       *sd)
                          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 */
diff --git a/test/glib/test-service-glib.c b/test/glib/test-service-glib.c
index 81cb556f..a2e36589 100644
--- a/test/glib/test-service-glib.c
+++ b/test/glib/test-service-glib.c
@@ -227,9 +227,9 @@ main (int argc, char **argv)
                                        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;
diff --git a/test/glib/test-thread-server.c b/test/glib/test-thread-server.c
index e61e3a6a..9b683983 100644
--- a/test/glib/test-thread-server.c
+++ b/test/glib/test-thread-server.c
@@ -131,7 +131,7 @@ filter_disconnect (DBusConnection     *connection,
                    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;
 
diff --git a/test/test-service.c b/test/test-service.c
index 588ef01f..9316b626 100644
--- a/test/test-service.c
+++ b/test/test-service.c
@@ -143,7 +143,7 @@ filter_func (DBusConnection     *connection,
              void               *user_data)
 {
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     {
       dbus_connection_disconnect (connection);