dbus/tools dbus-send.c,1.6,1.7

[Havoc Pennington]

Update of /cvs/dbus/dbus/tools
In directory pdx:/tmp/cvs-serv16249/tools

Modified Files:
	dbus-send.c 
Log Message:
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



Index: dbus-send.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-send.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dbus-send.c	30 Sep 2003 02:33:11 -0000	1.6
+++ dbus-send.c	10 Oct 2003 02:42:21 -0000	1.7
@@ -86,11 +86,9 @@
 
   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);