Do not provide a signature to dbus_message_iter_open_container() when opening a dict...
authorHavoc Pennington <hp@pobox.com>
Thu, 27 Mar 2008 20:52:40 +0000 (16:52 -0400)
committerHavoc Pennington <hp@pobox.com>
Thu, 27 Mar 2008 20:52:40 +0000 (16:52 -0400)
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.

ChangeLog
tools/dbus-send.c

index 5503219a65510c8c179f29e9e3ec8b16ca33e315..5a5f5ab18548644a96ed04ed46e6cf3791057774 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>
index 66d0bcf9e1f0d4454445417b812c997aa0368f38..407c04974bc439d2eac9b313fad41a5d190a2493 100644 (file)
@@ -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);