dbus/test test-service.c,1.15,1.16

Olivier Andrieu oandrieu at pdx.freedesktop.org
Sat Jun 5 09:32:02 PDT 2004


Update of /cvs/dbus/dbus/test
In directory pdx:/tmp/cvs-serv10912/test

Modified Files:
	test-service.c 
Log Message:
2004-06-05  Olivier Andrieu  <oliv__a at users.sourceforge.net>

	* dbus/dbus-connection.h, dbus/dbus-connection.c: have object path
	registration functions take the path argument as char* instead of
	char**.

	* dbus/dbus-marshal.h, dbus/dbus-marshal.c (_dbus_decompose_path):
	split off the path decompostion part of
	_dbus_demarshal_object_path. Some misc. fixes to silence compiler
	warnings. 

	* glib/dbus-gobject.c, test/test-service.c: update accordingly.


Index: test-service.c
===================================================================
RCS file: /cvs/dbus/dbus/test/test-service.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/test-service.c	21 Mar 2004 16:26:56 -0000	1.15
+++ b/test-service.c	5 Jun 2004 16:32:00 -0000	1.16
@@ -134,8 +134,8 @@
   NULL,
 };
 
-/* Pre-exploded path, "/org/freedesktop/TestSuite" */
-static const char* echo_path[] = { "org", "freedesktop", "TestSuite", NULL };
+
+static const char* echo_path = "/org/freedesktop/TestSuite" ;
 
 static DBusHandlerResult
 filter_func (DBusConnection     *connection,
@@ -195,7 +195,7 @@
                                      0, &error);
   if (dbus_error_is_set (&error))
     {
-      fprintf (stderr, "Error %s", error.message);
+      fprintf (stderr, "Error %s\n", error.message);
       _dbus_verbose ("*** Failed to acquire service: %s\n",
                      error.message);
       dbus_error_free (&error);




More information about the dbus-commit mailing list