summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémie Dimino <jeremie@dimino.org>2008-04-03 11:32:09 -0400
committerJohn (J5) Palmieri <johnp@redhat.com>2008-04-03 11:32:09 -0400
commita689ef29f176110b0f74e47fd5dd1d2d6ad3dfd3 (patch)
tree4d975ee3d2c9d6877e8a23031258f770cf8cf08a
parent7c4b34580290046fe7c136fab97b0be5642ee163 (diff)
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
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog10
-rw-r--r--tools/dbus-send.c9
3 files changed, 18 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index f295d6f1..f0c305bf 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 1f91cc89..ae1f7be0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
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
diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index 407c0497..3276b950 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);