From a221eefadfb48488129dedca2f2dc062e1c718e7 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 27 Mar 2004 05:29:31 +0000 Subject: 2004-03-27 Havoc Pennington MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch from Timo Teräs: * tools/dbus-send.c (main): if --print-reply, assume type is method call; support boolean type args * dbus/dbus-connection.c (dbus_connection_send_with_reply): fix a bunch of memleak and logic bugs --- tools/dbus-send.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'tools/dbus-send.c') diff --git a/tools/dbus-send.c b/tools/dbus-send.c index d0cca2fd..5ff9f576 100644 --- a/tools/dbus-send.c +++ b/tools/dbus-send.c @@ -64,7 +64,10 @@ main (int argc, char *argv[]) else if (strcmp (arg, "--session") == 0) type = DBUS_BUS_SESSION; else if (strcmp (arg, "--print-reply") == 0) - print_reply = TRUE; + { + print_reply = TRUE; + message_type = DBUS_MESSAGE_TYPE_METHOD_CALL; + } else if (strstr (arg, "--dest=") == arg) dest = strchr (arg, '=') + 1; else if (strstr (arg, "--type=") == arg) @@ -227,6 +230,18 @@ main (int argc, char *argv[]) dbus_message_iter_append_string (&iter, c); break; + case DBUS_TYPE_BOOLEAN: + if (strcmp(c, "true") == 0) + dbus_message_iter_append_boolean (&iter, TRUE); + else if (strcmp(c, "false") == 0) + dbus_message_iter_append_boolean (&iter, FALSE); + else + { + fprintf (stderr, "%s: Expected \"true\" or \"false\" instead of \"%s\"\n", argv[0], c); + exit (1); + } + break; + default: fprintf (stderr, "%s: Unsupported data type\n", argv[0]); exit (1); -- cgit