2003-08-30 Havoc Pennington <hp@pobox.com>

	* test/data/valid-config-files/system.d/test.conf: change to
	root for the user so warnings don't get printed

	* dbus/dbus-message.c: add dbus_message_get_path,
	dbus_message_set_path

	* dbus/dbus-object-tree.c (do_test_dispatch): add test of
	dispatching to a path

	* dbus/dbus-string.c (_dbus_string_validate_path): add

	* dbus/dbus-marshal.c (_dbus_demarshal_object_path): implement
	(_dbus_marshal_object_path): implement

	* dbus/dbus-protocol.h (DBUS_HEADER_FIELD_PATH): new header field
	to contain the path to the target object
	(DBUS_HEADER_FIELD_SENDER_SERVICE): rename
	DBUS_HEADER_FIELD_SENDER to explicitly say it's the sender service

5 files changed, 12 insertions, 14 deletions

diff --git a/glib/dbus-gidl.c b/glib/dbus-gidl.c
index c1a1f6dc..d64e95a7 100644
--- a/glib/dbus-gidl.c
+++ b/glib/dbus-gidl.c
@@ -197,12 +197,6 @@ method_info_get_args (MethodInfo *info)
   return info->args;
 }
 
-MethodStyle
-method_info_get_style (MethodInfo *info)
-{
-  return info->style;
-}
-
 void
 method_info_add_arg (MethodInfo    *info,
                      ArgInfo       *arg)
diff --git a/glib/dbus-gidl.h b/glib/dbus-gidl.h
index 812e1866..68649cf3 100644
--- a/glib/dbus-gidl.h
+++ b/glib/dbus-gidl.h
@@ -56,7 +56,6 @@ void           method_info_unref          (MethodInfo    *info);
 
 const char*    method_info_get_name       (MethodInfo    *info);
 GSList*        method_info_get_args       (MethodInfo    *info);
-MethodStyle    method_info_get_style      (MethodInfo    *info);
 void           method_info_add_arg        (MethodInfo    *info,
                                            ArgInfo       *arg);
 
diff --git a/glib/test-dbus-glib.c b/glib/test-dbus-glib.c
index 6b057078..beda0a7a 100644
--- a/glib/test-dbus-glib.c
+++ b/glib/test-dbus-glib.c
@@ -30,9 +30,10 @@ main (int argc, char **argv)
 
   dbus_connection_setup_with_g_main (connection, NULL);
 
-  message = dbus_message_new_method_call (DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
-                                          "Hello",
-                                          DBUS_SERVICE_ORG_FREEDESKTOP_DBUS);
+  message = dbus_message_new_method_call (DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
+                                          DBUS_PATH_ORG_FREEDESKTOP_DBUS,
+                                          DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                                          "Hello");
 
   dbus_error_init (&error);
   reply = dbus_connection_send_with_reply_and_block (connection, message, -1, &error);
diff --git a/glib/test-profile.c b/glib/test-profile.c
index bd04dd9c..3eac1618 100644
--- a/glib/test-profile.c
+++ b/glib/test-profile.c
@@ -34,7 +34,8 @@
 #define N_CLIENT_THREADS 1
 #define N_ITERATIONS 1000
 #define PAYLOAD_SIZE 30
-#define ECHO_INTERFACE "org.freedekstop.EchoTest"
+#define ECHO_PATH "/org/freedesktop/EchoTest"
+#define ECHO_INTERFACE "org.freedesktop.EchoTest"
 #define ECHO_METHOD "EchoProfile"
 
 static const char *address;
@@ -45,7 +46,8 @@ send_echo_message (DBusConnection *connection)
 {
   DBusMessage *message;
 
-  message = dbus_message_new_method_call (ECHO_INTERFACE, ECHO_METHOD, NULL);
+  message = dbus_message_new_method_call (NULL, ECHO_PATH,
+                                          ECHO_INTERFACE, ECHO_METHOD);
   dbus_message_append_args (message,
                             DBUS_TYPE_STRING, "Hello World!",
                             DBUS_TYPE_INT32, 123456,
diff --git a/glib/test-thread-client.c b/glib/test-thread-client.c
index 8a1e44cb..d51d4e6a 100644
--- a/glib/test-thread-client.c
+++ b/glib/test-thread-client.c
@@ -19,8 +19,10 @@ thread_func (gpointer data)
 
   while (1)
     {
-      message = dbus_message_new_method_call ("org.freedesktop.ThreadTest",
-                                              "TestMethod", NULL);
+      message = dbus_message_new_method_call (NULL,
+                                              "/org/freedesktop/ThreadTest",
+                                              "org.freedesktop.ThreadTest",
+                                              "TestMethod");
 
       dbus_message_append_iter_init (message, &iter);