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.

2 files changed, 18 insertions, 18 deletions

diff --git a/doc/dbus-faq.xml b/doc/dbus-faq.xml
index b197297e..a233a212 100644
--- a/doc/dbus-faq.xml
+++ b/doc/dbus-faq.xml
@@ -123,7 +123,7 @@
           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>
diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index ad21af62..74df3b33 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -2208,17 +2208,17 @@
       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
@@ -2228,11 +2228,11 @@
     </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>
@@ -2246,25 +2246,25 @@
       </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>
@@ -2460,14 +2460,14 @@
         <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