dbus/doc TODO,1.62,1.63 dbus-specification.xml,1.25,1.26

[Havoc Pennington]

Update of /cvs/dbus/dbus/doc
In directory gabe:/tmp/cvs-serv32703/doc

Modified Files:
	TODO dbus-specification.xml 
Log Message:
2005-02-10  Havoc Pennington  <hp at redhat.com>

	* dbus/dbus-message-factory.c (generate_special): modify test to
	avoid using a non-basic dict key

	* dbus/dbus-marshal-validate-util.c: add test for the below

	* doc/dbus-specification.xml: require that dict keys are a basic
	type

	* dbus/dbus-marshal-validate.c
	(_dbus_validate_signature_with_reason): require that dict key is a
	basic type



Index: TODO
===================================================================
RCS file: /cvs/dbus/dbus/doc/TODO,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- TODO	31 Jan 2005 02:55:12 -0000	1.62
+++ TODO	11 Feb 2005 01:13:45 -0000	1.63
@@ -27,15 +27,10 @@
    yourself; is it an error, or allowed? If allowed, 
    we need to have a test for it in the test suite.
 
- - add string array support back to append_args()
-
  - validate dict entry number of fields
 
  - just before 1.0, try a HAVE_INT64=0 build and be sure it runs
 
- - the spec and implementation should probably require dict keys
-   to be basic types
-
  - in dbus-keyring.c, enforce that the keyring dir is not 
    world readable/writable
 

Index: dbus-specification.xml
===================================================================
RCS file: /cvs/dbus/dbus/doc/dbus-specification.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- dbus-specification.xml	7 Feb 2005 05:44:57 -0000	1.25
+++ dbus-specification.xml	11 Feb 2005 01:13:45 -0000	1.26
@@ -274,11 +274,13 @@
       <para>
         A <literal>DICT_ENTRY</literal> works exactly like a struct, but rather
         than parentheses it uses curly braces, and it has more restrictions.
-        The restrictions are: it occurs only as an array element type; and it
-        has exactly two single complete types inside the curly
-        braces. Implementations must not accept dict entries outside of arrays,
-        and must not accept dict entries with zero, one, or more than two
-        fields. A dict entry is always a key-value pair.
+        The restrictions are: it occurs only as an array element type; it has
+        exactly two single complete types inside the curly braces; the first
+        single complete type (the "key") must be a basic type rather than a
+        container type. Implementations must not accept dict entries outside of
+        arrays, must not accept dict entries with zero, one, or more than two
+        fields, and must not accept dict entries with non-basic-typed keys. A
+        dict entry is always a key-value pair.
       </para>
       
       <para>