From 68a3c593b9e77b33614726363c7b6fd85d113021 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 18 Aug 2003 22:43:30 +0000 Subject: 2003-08-18 Havoc Pennington * dbus/dbus-hash.c (_dbus_hash_table_insert_two_strings): fix * dbus/dbus-message.c (_dbus_message_loader_queue_messages): fix dumb bug created earlier (wrong order of args to decode_header_data()) * tools/dbus-send.c: port * tools/dbus-print-message.c (print_message): port * test/data/*messages: port all messages over * dbus/dbus-message-builder.c: support including message type * bus/driver.c: port over * bus/dispatch.c: port over to new stuff * dbus/dbus-connection.c (_dbus_connection_new_for_transport): rename disconnect signal to "Disconnected" --- glib/test-dbus-glib.c | 7 ++++--- glib/test-profile.c | 28 ++++++++++++++++++++-------- glib/test-thread-client.c | 3 ++- glib/test-thread-server.c | 6 ++++-- 4 files changed, 30 insertions(+), 14 deletions(-) (limited to 'glib') diff --git a/glib/test-dbus-glib.c b/glib/test-dbus-glib.c index d4b5f9b2..6b057078 100644 --- a/glib/test-dbus-glib.c +++ b/glib/test-dbus-glib.c @@ -30,8 +30,9 @@ main (int argc, char **argv) dbus_connection_setup_with_g_main (connection, NULL); - message = dbus_message_new_method_call (DBUS_MESSAGE_HELLO, - DBUS_SERVICE_DBUS); + message = dbus_message_new_method_call (DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS, + "Hello", + DBUS_SERVICE_ORG_FREEDESKTOP_DBUS); dbus_error_init (&error); reply = dbus_connection_send_with_reply_and_block (connection, message, -1, &error); @@ -42,7 +43,7 @@ main (int argc, char **argv) return 1; } - g_print ("reply name: %s\n", dbus_message_get_name (reply)); + g_print ("reply received\n"); g_main_loop_run (loop); diff --git a/glib/test-profile.c b/glib/test-profile.c index 852bd091..bd04dd9c 100644 --- a/glib/test-profile.c +++ b/glib/test-profile.c @@ -21,6 +21,11 @@ * */ +/* FIXME this test is wacky since both client and server keep + * sending each other method calls, but nobody sends + * a DBUS_MESSAGE_TYPE_METHOD_RETURN + */ + #include #include #include "dbus-glib.h" @@ -29,7 +34,9 @@ #define N_CLIENT_THREADS 1 #define N_ITERATIONS 1000 #define PAYLOAD_SIZE 30 -#define ECHO_MESSAGE "org.freedesktop.DBus.Test.EchoProfile" +#define ECHO_INTERFACE "org.freedekstop.EchoTest" +#define ECHO_METHOD "EchoProfile" + static const char *address; static unsigned char *payload; @@ -38,7 +45,7 @@ send_echo_message (DBusConnection *connection) { DBusMessage *message; - message = dbus_message_new_method_call (ECHO_MESSAGE, NULL); + message = dbus_message_new_method_call (ECHO_INTERFACE, ECHO_METHOD, NULL); dbus_message_append_args (message, DBUS_TYPE_STRING, "Hello World!", DBUS_TYPE_INT32, 123456, @@ -61,13 +68,15 @@ client_filter (DBusMessageHandler *handler, { int *iterations = user_data; - if (dbus_message_has_name (message, DBUS_MESSAGE_LOCAL_DISCONNECT)) + if (dbus_message_is_signal (message, + DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + "Disconnected")) { g_printerr ("Client thread disconnected\n"); exit (1); } - else if (dbus_message_has_name (message, - ECHO_MESSAGE)) + else if (dbus_message_is_method_call (message, + ECHO_INTERFACE, ECHO_METHOD)) { *iterations += 1; if (*iterations >= N_ITERATIONS) @@ -139,13 +148,16 @@ server_filter (DBusMessageHandler *handler, DBusMessage *message, void *user_data) { - if (dbus_message_has_name (message, DBUS_MESSAGE_LOCAL_DISCONNECT)) + if (dbus_message_is_signal (message, + DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + "Disconnected")) { g_printerr ("Server thread disconnected\n"); exit (1); } - else if (dbus_message_has_name (message, - ECHO_MESSAGE)) + else if (dbus_message_is_method_call (message, + ECHO_INTERFACE, + ECHO_METHOD)) { send_echo_message (connection); return DBUS_HANDLER_RESULT_HANDLED; diff --git a/glib/test-thread-client.c b/glib/test-thread-client.c index a3290b27..8a1e44cb 100644 --- a/glib/test-thread-client.c +++ b/glib/test-thread-client.c @@ -19,7 +19,8 @@ thread_func (gpointer data) while (1) { - message = dbus_message_new_method_call ("org.freedesktop.ThreadTest", NULL); + message = dbus_message_new_method_call ("org.freedesktop.ThreadTest", + "TestMethod", NULL); dbus_message_append_iter_init (message, &iter); diff --git a/glib/test-thread-server.c b/glib/test-thread-server.c index 3ad1f907..33652f8c 100644 --- a/glib/test-thread-server.c +++ b/glib/test-thread-server.c @@ -43,7 +43,8 @@ handle_test_message (DBusMessageHandler *handler, GString *counter_str; int i; - if (!dbus_message_has_name (message, "org.freedesktop.ThreadTest")) + if (!dbus_message_is_method_call (message, "org.freedesktop.ThreadTest", + "TestMethod")) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; dbus_message_iter_init (message, &iter); @@ -145,7 +146,8 @@ handle_disconnect (DBusMessageHandler *handler, DBusMessage *message, void *user_data) { - if (!dbus_message_has_name (message, DBUS_MESSAGE_LOCAL_DISCONNECT)) + if (!dbus_message_is_signal (message, DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + "Disconnected")) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; g_print ("connection disconnected\n"); -- cgit