Do not provide a signature to dbus_message_iter_open_container() when opening a dict...

2008-03-27  Havoc Pennington  <hp@redhat.com>

	* tools/dbus-send.c (append_dict): Do not provide a signature to
	dbus_message_iter_open_container() when opening a dict entry.

diff --git a/ChangeLog b/ChangeLog
index 5503219..5a5f5ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-27  Havoc Pennington  <hp@redhat.com>
+
+       * tools/dbus-send.c (append_dict): Do not provide a signature to
+       dbus_message_iter_open_container() when opening a dict entry.
+
 2008-03-26  Colin Walters  <walters@verbum.org>
 
        Patch from Scott James Remnant <scott@netsplit.com>

diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index 66d0bcf..407c049 100644 (file)
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -150,14 +150,10 @@ append_dict (DBusMessageIter *iter, int keytype, int valtype, const char *value)
   while (val != NULL)
     {
       DBusMessageIter subiter;
-      char sig[3];
-      sig[0] = keytype;
-      sig[1] = valtype;
-      sig[2] = '\0';
       
       dbus_message_iter_open_container (iter,
                                        DBUS_TYPE_DICT_ENTRY,
-                                       sig,
+                                       NULL,
                                        &subiter);
 
       append_arg (&subiter, keytype, val);