summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2008-03-27 16:52:40 -0400
committerHavoc Pennington <hp@pobox.com>2008-03-27 16:52:40 -0400
commit4058579dae09659ea2dc7f3dd20e034a3be3b0bf (patch)
treeaf2d70e41223867420cb9c1029b1e596d9a47ef9
parent52ea0f2cbbf30d7652c38ae5ec89e663ea780b5e (diff)
Do not provide a signature to dbus_message_iter_open_container() when opening a dict entry.
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.
-rw-r--r--ChangeLog5
-rw-r--r--tools/dbus-send.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5503219a..5a5f5ab1 100644
--- 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 66d0bcf9..407c0497 100644
--- 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);