dbus/tools dbus-viewer.c, 1.10, 1.11 dbus-names-model.c, 1.4, 1.5 dbus-monitor.c, 1.12, 1.13

[Colin Walters]

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

Modified Files:
	dbus-viewer.c dbus-names-model.c dbus-monitor.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-viewer.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-viewer.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dbus-viewer.c	13 Feb 2005 17:16:25 -0000	1.10
+++ dbus-viewer.c	17 Feb 2005 21:19:48 -0000	1.11
@@ -169,7 +169,7 @@
           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 @@
           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 @@
   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)
     {

Index: dbus-names-model.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-names-model.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-names-model.c	31 Jan 2005 03:15:24 -0000	1.4
+++ dbus-names-model.c	17 Feb 2005 21:19:48 -0000	1.5
@@ -245,9 +245,9 @@
       
       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,

Index: dbus-monitor.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-monitor.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dbus-monitor.c	29 Oct 2004 18:52:30 -0000	1.12
+++ dbus-monitor.c	17 Feb 2005 21:19:48 -0000	1.13
@@ -35,7 +35,7 @@
   print_message (message);
   
   if (dbus_message_is_signal (message,
-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                              DBUS_INTERFACE_LOCAL,
                               "Disconnected"))
     exit (0);