Revert "fix dbus-send so it can correctly send dictionaries"

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.

diff --git a/AUTHORS b/AUTHORS
index f0c305b..f295d6f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,7 +8,6 @@ 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 5f9f4df..909fa51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,16 +14,6 @@
 
 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>
 
        * bus/expirelist.c
@@ -83,7 +73,6 @@
        the bus, not before.  This ensures that programs which wish to set
        exit_on_disconnect to FALSE will not be terminated if the bus exits
        during registration.  (FDO Bug #15112)
->>>>>>> 68f69d38182ed5974984b0434086e6a288b477cb:ChangeLog
 
 2008-03-04  John (J5) Palmieri  <johnp@redhat.com>
 

diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index 3276b95..407c049 100644 (file)
--- 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);