dbus/glib dbus-gproxy.c,1.21,1.22 dbus-gobject.c,1.17,1.18

[Colin Walters]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv12542/glib

Modified Files:
	dbus-gproxy.c dbus-gobject.c 
Log Message:
2005-02-17  Colin Walters  <walters at 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.


Index: dbus-gproxy.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gproxy.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- dbus-gproxy.c	17 Feb 2005 17:41:26 -0000	1.21
+++ dbus-gproxy.c	17 Feb 2005 21:19:48 -0000	1.22
@@ -580,7 +580,7 @@
   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
@@ -1153,9 +1153,9 @@
   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");

Index: dbus-gobject.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gobject.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dbus-gobject.c	17 Feb 2005 17:41:26 -0000	1.17
+++ dbus-gobject.c	17 Feb 2005 21:19:48 -0000	1.18
@@ -535,14 +535,14 @@
   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");
@@ -945,7 +945,7 @@
   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);
   
@@ -959,11 +959,11 @@
   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;