2005-06-16 Colin Walters <walters@verbum.org>

	* tools/dbus-send.c (append_array): Use strtok.
	(append_dict): New function.
	(type_from_name): New function, extracted from main.
	(main): Handle sending dicts.

	* tools/dbus-print-message.c (print_iter): Print dict
	entries.

1 files changed, 13 insertions, 0 deletions

diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index 7fcdec79..bd47666c 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -118,6 +118,19 @@ print_iter (DBusMessageIter *iter, int depth)
 	    printf("]");
 	    break;
 	  }
+	case DBUS_TYPE_DICT_ENTRY:
+	  {
+	    DBusMessageIter subiter;
+
+	    dbus_message_iter_recurse (iter, &subiter);
+
+	    printf("{");
+	    print_iter (&subiter, depth);
+	    dbus_message_iter_next (&subiter);
+	    print_iter (&subiter, depth);
+	    printf("}");
+	    break;
+	  }
 	    
 	default:
 	  printf (" (dbus-monitor too dumb to decipher arg type '%c')\n", type);