From: Jérémie Dimino <jeremie@dimino.org>
Date: Thu, 3 Apr 2008 15:32:09 +0000 (-0400)
Subject: fix dbus-send so it can correctly send dictionaries
X-Git-Tag: dbus-1.2.1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a689ef29f176110b0f74e47fd5dd1d2d6ad3dfd3;p=thirdparty%2Fdbus.git

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 f295d6f10..f0c305bf7 100644
--- 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 1f91cc89c..ae1f7be00 100644
--- 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 407c04974..3276b9507 100644
--- 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);