summaryrefslogtreecommitdiffstats
path: root/tools/dbus-send.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-10-10 02:42:21 +0000
committerHavoc Pennington <hp@redhat.com>2003-10-10 02:42:21 +0000
commit6a65f4802e95ba442c520f8e225da837e0a9f73b (patch)
tree734e69da90869b3788d381e75911d720ad8cfd0f /tools/dbus-send.c
parent79d03f94fec278d270a33792aeffb33ba239bb01 (diff)
2003-10-09 Havoc Pennington <hp@redhat.com>
Make matching rules theoretically work (add parser). * bus/bus.c (bus_context_check_security_policy): fix up to handle the case where destination is explicitly specified as bus driver and someone else is eavesdropping. * bus/policy.c (bus_client_policy_check_can_receive): fix up definition of eavesdropping and assertion * tools/dbus-send.c (main): use dbus_message_type_from_string * bus/signals.c (bus_match_rule_parse): implement * dbus/dbus-message.c (dbus_message_type_from_string): new * dbus/dbus-errors.h (DBUS_ERROR_MATCH_RULE_INVALID): add
Diffstat (limited to 'tools/dbus-send.c')
-rw-r--r--tools/dbus-send.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index 06a87adb..d0cca2fd 100644
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -86,11 +86,9 @@ main (int argc, char *argv[])
if (type_str != NULL)
{
- if (strcmp (type_str, "method_call") == 0)
- message_type = DBUS_MESSAGE_TYPE_METHOD_CALL;
- else if (strcmp (type_str, "signal") == 0)
- message_type = DBUS_MESSAGE_TYPE_SIGNAL;
- else
+ message_type = dbus_message_type_from_string (type_str);
+ if (!(message_type == DBUS_MESSAGE_TYPE_METHOD_CALL ||
+ message_type == DBUS_MESSAGE_TYPE_SIGNAL))
{
fprintf (stderr, "Message type \"%s\" is not supported\n",
type_str);