dbus/test test-service.c,1.18,1.19

[Havoc Pennington]

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

Modified Files:
	test-service.c 
Log Message:
2005-01-18  Havoc Pennington  <hp@redhat.com>

        * Throughout, grand renaming to strip out the use of "service",
	just say "name" instead (or "bus name" when ambiguous).  Did not
	change the internal code of the message bus itself, only the
	programmer-facing API and messages.
	
	* doc/dbus-specification.xml: further update the message bus section
	
	* bus/config-parser.c (all_are_equiv): fix bug using freed string
	in error case



Index: test-service.c
===================================================================
RCS file: /cvs/dbus/dbus/test/test-service.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- test-service.c	15 Jan 2005 07:15:38 -0000	1.18
+++ test-service.c	18 Jan 2005 20:42:15 -0000	1.19
@@ -165,7 +165,7 @@
   int result;
   
   dbus_error_init (&error);
-  connection = dbus_bus_get (DBUS_BUS_ACTIVATION, &error);
+  connection = dbus_bus_get (DBUS_BUS_STARTER, &error);
   if (connection == NULL)
     {
       fprintf (stderr, "*** Failed to open connection to activating message bus: %s\n",
@@ -191,8 +191,8 @@
                                              NULL))
     die ("No memory");
 
-  result = dbus_bus_acquire_service (connection, "org.freedesktop.DBus.TestSuiteEchoService",
-                                     0, &error);
+  result = dbus_bus_request_name (connection, "org.freedesktop.DBus.TestSuiteEchoService",
+                                  0, &error);
   if (dbus_error_is_set (&error))
     {
       fprintf (stderr, "Error %s\n", error.message);