From d7446ac003f63aca29624b42b55f13b64e19a77f Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Fri, 4 Apr 2008 14:58:07 -0400 Subject: Revert "fix dbus-send so it can correctly send dictionaries" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a689ef29f176110b0f74e47fd5dd1d2d6ad3dfd3. Conflicts: ChangeLog * Turns out I reversed a patch that was alread committed but the bug had not been closed. Since the patch was applied before I also reverted the mention of Jérémie in the AUTHORS list mainly for license book keeping sanity. --- tools/dbus-send.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/dbus-send.c b/tools/dbus-send.c index 3276b950..407c0497 100644 --- a/tools/dbus-send.c +++ b/tools/dbus-send.c @@ -150,15 +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); -- cgit