fix dbus-send so it can correctly send dictionaries

* tools/dbus-send.c (append_dict): Send in signature when opening up
  a dict entry container

* AUTHORS: Add Jérémie to AUTHORS file since it was a slightly above
  trivial fix

diff --git a/AUTHORS b/AUTHORS
index f295d6f1036939af9e9ce71cc3eccbf05b39d934..f0c305bf7bdd8b31dfce5f7c6fbc6fc5ff5aaa46 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ Carlos Garcia Campos <carlosgc@gnome.org>
 Brian Cameron <brian.cameron@sun.com>
 Anders Carlsson <andersca@gnome.org>
 Frederic Crozat <fcrozat@mandriva.com>
+Jérémie Dimino <jeremie@dimino.org>
 Christian Ehrlicher <ch.ehrlicher@gmx.de>
 Harald Fernengel <harry@kdevelop.org>
 Owen Fraser-Green <owen@discobabe.net>

diff --git a/ChangeLog b/ChangeLog
index 1f91cc89c19b1a35d5f58a1c99df73b1f9a7bfdc..ae1f7be0081c7eb678eb3dcf5fc4f5b5e1bd6d8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-03  John (J5) Palmieri <johnp@redhat.com>
+
+       Patch from Jérémie Dimino <jeremie at dimino.org>
+
+       * tools/dbus-send.c (append_dict): Send in signature when opening up
+         a dict entry container
+
+       * AUTHORS: Add Jérémie to AUTHORS file since it was a slightly above
+         trivial fix
+
 2008-04-03  John (J5) Palmieri <johnp@redhat.com>
 
        Patch from Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>

diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index 407c04974bc439d2eac9b313fad41a5d190a2493..3276b95076194c172f32d5b2bc0abc9b18689dfb 100644 (file)
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -150,10 +150,15 @@ 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,
-                                       NULL,
+                                       sig,
                                        &subiter);
 
       append_arg (&subiter, keytype, val);