dbus/test/glib test-thread-server.c, 1.4, 1.5 test-service-glib.c, 1.8, 1.9 test-profile.c, 1.19, 1.20 test-dbus-glib.c, 1.13, 1.14

[Colin Walters]

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

Modified Files:
	test-thread-server.c test-service-glib.c test-profile.c 
	test-dbus-glib.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: test-thread-server.c
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-thread-server.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test-thread-server.c	15 Jan 2005 07:15:38 -0000	1.4
+++ test-thread-server.c	17 Feb 2005 21:19:48 -0000	1.5
@@ -131,7 +131,7 @@
                    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;
 

Index: test-service-glib.c
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-service-glib.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- test-service-glib.c	17 Feb 2005 17:41:24 -0000	1.8
+++ test-service-glib.c	17 Feb 2005 21:19:48 -0000	1.9
@@ -227,9 +227,9 @@
                                        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;

Index: test-profile.c
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-profile.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- test-profile.c	11 Feb 2005 01:13:45 -0000	1.19
+++ test-profile.c	17 Feb 2005 21:19:48 -0000	1.20
@@ -143,7 +143,7 @@
                                    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 @@
   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 @@
   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 @@
                          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 */

Index: test-dbus-glib.c
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-dbus-glib.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- test-dbus-glib.c	17 Feb 2005 17:41:24 -0000	1.13
+++ test-dbus-glib.c	17 Feb 2005 21:19:48 -0000	1.14
@@ -67,9 +67,9 @@
   /* 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 */